[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 41cc64f81b -s ours am: a791ebf496 -s ours

am skip reason: Merged-In I8faad0984d4bc3b589d0d226224d276ab2f4b2e6 with SHA-1 6523454e42 is already in history

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

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