Merge "Revert submission 1182953-1576003954286-8455af5a"
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6d134dd..2895801 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -97,6 +97,7 @@
idmap2 \
idmap2d \
ime \
+ ims-common \
incident \
incidentd \
incident_helper \
@@ -250,6 +251,7 @@
task_profiles.json \
tc \
telecom \
+ telephony-common \
tombstoned \
traced \
traced_probes \
@@ -331,8 +333,6 @@
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 += \