Merge "Remove com.android.geotz jar from system server" into sc-dev

target/product/base_system.mk

@@ -54,7 +54,6 @@ PRODUCT_PACKAGES += \
     com.android.conscrypt \
     com.android.cronet \
     com.android.extservices \
-    com.android.geotz \
     com.android.i18n \
     com.android.ipsec \
     com.android.location.provider \

target/product/default_art_config.mk

@@ -70,7 +70,6 @@ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
     com.android.media:service-media-s \
     com.android.permission:service-permission \
-    com.android.geotz:geotz
 
 # Minimal configuration for running dex2oat (default argument values).
 # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.