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

am skip reason: Merged-In If08bd327896c095dfbefc3e3e7d802014de27c2e with SHA-1 dc69eeea is already in history

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



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