[automerger skipped] Merge Android 13 QPR3...

[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 95ab9acd -s ours am: 949031da -s ours

am skip reason: Merged-In I1e54aafcca9e720d9a9fe718553e6f13cef1922b with SHA-1 032c5355 is already in history

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



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