[automerger skipped] Merge "Merge Android 12" am: ec7d6a54 -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: ec7d6a54 -s ours am: 5699e5d2 -s ours am: 0178527e -s ours am: e2b1a2c9 -s ours

am skip reason: Merged-In I702e1df9c772e506ecf4f386deff9657db4b5dc8 with SHA-1 a547fa90 is already in history

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

Change-Id: I11babef5495888d3024ccdadd8d06df88118f54c