[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into...

[automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: f31433ca -s ours

am skip reason: Merged-In I4316779bb16bc96102a7bb30a634a23e127b34e3 with SHA-1 12b31c53 is already in history

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



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