[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 97a447b9a8 -s ours am: 6cadf43b34 -s ours am: 21f3762d01 -s ours

am skip reason: subject contains skip directive

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

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