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

am skip reason: Merged-In I1c5acde9514207aba7cabceeaca9ccbd8c7f461a with SHA-1 6d08308c is already in history

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



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