[automerger skipped] Merge "Merge Android 12" am: 1938d3d85d -s ours am: a71bba0af4 -s ours

am skip reason: Merged-In Ie8202a904494f570f2d894947337f05066d35992 with SHA-1 db89b3d2aa is already in history

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

Change-Id: I765c76f807ea5b803c4c25065f0f0f9832bb807b