[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: 87d10e2a -s ours

am skip reason: subject contains skip directive

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



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