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

am skip reason: subject contains skip directive

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

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