Merge "DO NOT MERGE: Remove AppSearch from Android R." into rvc-dev

target/product/base_system.mk

@@ -50,7 +50,6 @@ PRODUCT_PACKAGES += \
     cmd \
     com.android.adbd \
     com.android.apex.cts.shim.v1 \
-    com.android.appsearch \
     com.android.conscrypt \
     com.android.extservices \
     com.android.i18n \
@@ -329,7 +328,6 @@ PRODUCT_BOOT_JARS := \
     framework-telephony
 
 PRODUCT_UPDATABLE_BOOT_JARS := \
-    com.android.appsearch:framework-appsearch \
     com.android.conscrypt:conscrypt \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \

target/product/media_system.mk

@@ -60,7 +60,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \
 # system server jars which are updated via apex modules.
 # The values should be of the format <apex name>:<jar name>
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
-    com.android.appsearch:service-appsearch \
     com.android.permission:service-permission \
     com.android.wifi:wifi-service \
     com.android.ipsec:android.net.ipsec.ike \