[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: e05579eca0 -s ours am: 274572988c -s ours

am skip reason: Merged-In Ie707d0f843e4d2a73bf36befe9d21825267ca101 with SHA-1 da0da41b45 is already in history

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

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