[automerger skipped] Merge Android 12 QPR 3 am: af03cf4a -s ours am: 6025941f -s ours

am skip reason: Merged-In I070e4ef71b381cf1253f50362810c5270f97e9a9 with SHA-1 56fc40f2 is already in history

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



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