Merge "Revert submission 1182953-1576003954286-8455af5a" am: 42f2c761bf am: 7da11edb71

Change-Id: Ife36d7f71d16943e0044ab8e1155aeb74edfb6c6

target/product/base_system.mk

@@ -97,6 +97,7 @@ PRODUCT_PACKAGES += \
     idmap2 \
     idmap2d \
     ime \
+    ims-common \
     incident \
     incidentd \
     incident_helper \
@@ -250,6 +251,7 @@ PRODUCT_PACKAGES += \
     task_profiles.json \
     tc \
     telecom \
+    telephony-common \
     tombstoned \
     traced \
     traced_probes \
@@ -331,8 +333,6 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.ipsec:ike \
     com.android.media:updatable-media \
     com.android.sdkext:framework-sdkext \
-    com.android.telephony:telephony-common \
-    com.android.telephony:ims-common \
     com.android.tethering:framework-tethering
 
 PRODUCT_COPY_FILES += \