[automerger skipped] Merge "Merge Android 13 QPR3" am: f2cdabbb -s ours am:...

[automerger skipped] Merge "Merge Android 13 QPR3" am: f2cdabbb -s ours am: 9a968732 -s ours am: a942ea5b -s ours am: d2e5228d -s ours am: f824c106 -s ours am: 5bf4a8bd -s ours

am skip reason: Merged-In I6bce939eba30a507fcb12143b236780d53549837 with SHA-1 043f4b9f is already in history

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



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