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

[automerger skipped] Merge "Merge Android 13 QPR2" am: b784c3be -s ours am: 5325334d -s ours am: 2b296b48 -s ours am: d5739045 -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: Iaa8c75b29f227c926d953f457ac7597b5c9bcf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>