[automerger skipped] Merge TQ1A.221205.012 am: fb82206d -s ours am: a2a3ab42 -s ours

am skip reason: Merged-In Ica8c4fffbd4ac178ef4883626e072de04ea94bf6 with SHA-1 15cc4653 is already in history

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



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