[automerger skipped] Merge "Merge Android 13 QPR3" am: f2cdabbb -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: I3032fdf30a550ed7720f58835ddb447c042a73e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>