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

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

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



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