[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: a025046919 -s ours

am skip reason: Merged-In I0b2b75f5a2532aaba0e0f53a1e32bcb544e4638c with SHA-1 9f30609a1d is already in history

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

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