[automerger skipped] Merge "Merge Android 12L" am: 6585bbeb -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: 6585bbeb -s ours am: 3573c7cd -s ours am: 6eed8154 -s ours

am skip reason: Merged-In Id8bbfbbdba87d09ff647bee9e35402c6a485a638 with SHA-1 8a795390 is already in history

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

Change-Id: I6d63392e746cdd78df564188f25cd2b64840a7b6