[automerger skipped] Merge Android 12L am: 09b6a2fe -s ours am: fb6af869...

[automerger skipped] Merge Android 12L am: 09b6a2fe -s ours am: fb6af869 -s ours am: 5eca7d4b -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: I3de9c371fbd8eb0dc7e3aab4fe95975fc7c89eab