[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: cfc58f9707 -s ours am: c373ba609e -s ours

am skip reason: Merged-In I5f7aab63d8e4570fe0e950258a537dc9d2e52943 with SHA-1 7ea0ff2754 is already in history

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

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