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

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

am skip reason: Merged-In I7745d0877b1da396c8997c5fbee391e7f188dfb4 with SHA-1 a73b43ee is already in history

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



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