[automerger skipped] Merge Android 13 QPR1 am: b4cf7280 -s ours am:...

[automerger skipped] Merge Android 13 QPR1 am: b4cf7280 -s ours am: 27d03c86 -s ours am: 30a55ea5 -s ours

am skip reason: Merged-In I6b073f730282ca68311b4407936871e65663cc7a with SHA-1 77a487a3 is already in history

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



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