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

am skip reason: Merged-In I92da19bd0553b6c0510443a33ed1e53f814927ed with SHA-1 0d8580cb0d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/25973902

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