Merge "Move service-statsd to updatable system server jar"

target/product/base_system.mk

@@ -64,6 +64,7 @@ PRODUCT_PACKAGES += \
     com.android.resolv \
     com.android.neuralnetworks \
     com.android.sdkext \
+    com.android.os.statsd \
     com.android.telephony \
     com.android.tzdata \
     com.android.wifi \
@@ -253,7 +254,6 @@ PRODUCT_PACKAGES += \
     snapshotctl \
     SoundPicker \
     statsd \
-    service-statsd \
     storaged \
     surfaceflinger \
     svc \

target/product/media_system.mk

@@ -55,14 +55,14 @@ PRODUCT_SYSTEM_SERVER_JARS := \
     ethernet-service \
     com.android.location.provider \
     service-jobscheduler \
-    service-statsd \
     service-blobstore \
     service-appsearch \
 
 # 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.wifi:wifi-service
+    com.android.os.statsd:service-statsd \
+    com.android.wifi:wifi-service \
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt