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

[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 768c2212 -s ours am: 00b5c9dc -s ours

am skip reason: Merged-In I8b996dca2158c34aff8848c55be13f6ff8ecd254 with SHA-1 cd270d52 is already in history

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



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