Merge "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: f1d8e1d67a -s ours am: 19af1cf615 -s ours" into tm-d1-dev-plus-aosp am: 855f1779d7 -s ours

am skip reason: Merged-In Ied32aed9ae0948c40cd3daf6bb70b4fdeebdd7f8 with SHA-1 6d55213fb3 is already in history

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

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