[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: 27852a1a -s ours

am skip reason: subject contains skip directive

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



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