[automerger skipped] Merge "Merge Android 12 QPR1" am: c32826a808 -s ours am: 811539dc7c -s ours

am skip reason: Merged-In I9f7a1e8d6c2971e7d1028cd331c736228de8df0d with SHA-1 ffc149312e is already in history

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

Change-Id: Ie08d35b7e3dec2bf94863b64f1d9e1085ac71065