[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 2ae9a8a8 -s ours am: ace3837a -s ours am: 102b2c36 -s ours

am skip reason: subject contains skip directive

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



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