[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: b86588197c -s ours

am skip reason: Merged-In I89254c188f7b5edf20b574680a2792f6b96a0c25 with SHA-1 9558ed5c0a is already in history

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

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