[automerger skipped] Merge Android 12 QPR 3 am: 0b8a9d63 -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 0b8a9d63 -s ours am: 217d6598 -s ours am: a6a6291e -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: Ie6cec0296e4ed16b39ed097852d2053d0c73685f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>