[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e8231b64 -s ours...

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e8231b64 -s ours am: 95f3e864 -s ours am: d30b0f92 -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: Ib63c87ea315e3e10689d34d504063c4f4bc4f4fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>