[automerger skipped] Merge "Merge Android 12 QPR1" am: 723a90b8 -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR1" am: 723a90b8 -s ours am: 2851e2c1 -s ours am: e289544e -s ours

am skip reason: Merged-In Ib953fa4c7481b01f0fedafe71cdfe0816b5c94c0 with SHA-1 7cff8ecb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1921938

Change-Id: I8ec9460ebf6ee0576337abbb182b496f67f5057c