[automerger skipped] Merge Android 12 QPR1 am: 10c4cd3f2e -s ours am: 3b7927d449 -s ours am: 72af7a5628 -s ours am: 8b55c0650a -s ours

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

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

Change-Id: Iac95257e0e586bcaf4a4eb1a2e187d5816d6af47