Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES"

target/product/base_system.mk

@@ -54,6 +54,7 @@ PRODUCT_PACKAGES += \
     charger \
     cmd \
     com.android.conscrypt \
+    com.android.i18n \
     com.android.location.provider \
     com.android.resolv \
     com.android.neuralnetworks \
@@ -289,7 +290,7 @@ PRODUCT_HOST_PACKAGES += \
     e2fsck \
     fastboot \
     flags_health_check \
-    icu-data_host_runtime_apex \
+    icu-data_host_i18n_apex \
     icu_tzdata.dat_host_tzdata_apex \
     incident_report \
     ld.mc \

target/product/base_vendor.mk

@@ -36,7 +36,7 @@ PRODUCT_HOST_PACKAGES += \
     make_f2fs \
 
 PRODUCT_HOST_PACKAGES += \
-    icu-data_host_runtime_apex
+    icu-data_host_i18n_apex
 
 # Base modules and settings for the vendor partition.
 PRODUCT_PACKAGES += \