[automerger skipped] Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 2ebdbec80e -s ours am: c520eebc94 -s ours

am skip reason: subject contains skip directive

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

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