[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: 13f18293e5 -s ours am: 419c2ca610 -s ours am: ea4520515b -s ours am: 4413a4120b -s ours am: 1b32624d84 -s ours

am skip reason: Merged-In Ie2f49b6c4d38ccb7bb0c04098943b069be2edded with SHA-1 c627ff9abd is already in history

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

Change-Id: Ia69842d1e2ad469b97824863d7a493c5c59c7d6c
Signed-off-by: Automerger Merge Worker <[email protected]>