[automerger skipped] Merge "Merge Android 12 QPR1" am: c32826a808 -s ours am: 811539dc7c -s ours am: 6809a77ef7 -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: I81dec312d8b2e3a76192a3a1d5d3a147cd222c6f