[automerger skipped] Merge Android 13 QPR2 am: beaa4322 -s ours am:...

[automerger skipped] Merge Android 13 QPR2 am: beaa4322 -s ours am: bce83bbb -s ours am: af6a1064 -s ours am: f1bf72c9 -s ours am: 00a5f00a -s ours

am skip reason: Merged-In Ifde290a188e002b5d05e210c34a50a6bf2551863 with SHA-1 8c54c1dc is already in history

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



Change-Id: I4adf8a928fd6db466f2b75d8496598a0b160be4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>