[automerger skipped] Merge 10952656 am: 5721e2eb7e -s ours am: d2a229caf7 -s ours

am skip reason: Merged-In I63811473ca6bf27c058f62560a7e810c3fe6ef35 with SHA-1 d02843a30f is already in history

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

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