[automerger skipped] Merge "Merge Android 12 QPR 3" am: 99820649 -s ours am: 93c7ef79 -s ours

am skip reason: Merged-In I070f8099ad72ee7d5ad2415e7adada10df298536 with SHA-1 b567b760 is already in history

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



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