diff --git a/core/construct_context.sh b/core/construct_context.sh
index 794795a7b5..34f7ee673b 100755
--- a/core/construct_context.sh
+++ b/core/construct_context.sh
@@ -66,6 +66,11 @@ fi
 if [[ "${target_sdk_version}" -lt "29" ]]; then
   add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}"
 fi
+# TODO(b/139318877) Remove check for SDK_VERSION_CUR_DEVELOPMENT after cleaning up system apps targeting on
+# current SDK version and link telephony-common
+if [ "${target_sdk_version}" -lt "30" ] || [ "${target_sdk_version}" -eq "10000"]; then
+  add_to_contexts "${conditional_host_libs_30}" "${conditional_target_libs_30}"
+fi
 
 add_to_contexts "${dex_preopt_host_libraries}" "${dex_preopt_target_libraries}"
 
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 50e922e36d..821e02bf96 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -187,6 +187,7 @@ ifdef LOCAL_DEX_PREOPT
     org.apache.http.legacy \
     android.hidl.base-V1.0-java \
     android.hidl.manager-V1.0-java \
+    telephony-common \
 
   my_dexpreopt_libs := $(sort \
     $(LOCAL_USES_LIBRARIES) \
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index f2b98c5ead..e5c5f34873 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -326,7 +326,6 @@ PRODUCT_BOOT_JARS := \
     $(TARGET_CORE_JARS) \
     framework \
     ext \
-    telephony-common \
     voip-common \
     ims-common \
     updatable-media