Merge "Merge "Removed telephony apex" into tm-dev am: 9bcd7d5f7a am: c07681e7ad" into tm-d1-dev-plus-aosp am: 6da3d5b490

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/18129196

Change-Id: Ie0a298626ad8df41f11e49ef94de4754cba3dd60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>