[automerger skipped] Merge Android 12 QPR1 am: 10c4cd3f -s ours am:...

[automerger skipped] Merge Android 12 QPR1 am: 10c4cd3f -s ours am: 3b7927d4 -s ours am: 72af7a56 -s ours

am skip reason: Merged-In Ice9777b662ddac09a43811946eb4312e08add8fc with SHA-1 45f0feb0 is already in history

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

Change-Id: I54635857d8e54f090f76b469ca86b359d902a32d