[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: efa6ad0e -s ours am: 6a8c01cb -s ours am: cf1fada6 -s ours am: f9007ccc -s ours am: 6b20cd7f -s ours am: fb29c4a4 -s ours

am skip reason: subject contains skip directive

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



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