[automerger skipped] Merge UQ1A.231205.015 am: cac7a90a69 -s ours am: 960efc4cc1 -s ours

am skip reason: Merged-In I4151fb683b0df25a3bf0070ef71c90ba29ebf7cc with SHA-1 67931a8dc8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/25587450

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