[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future am: 87bcc8d82c -s ours

am skip reason: Merged-In I6a485b51064bf6307dafb853492c9484925ca0a0 with SHA-1 d33adf2745 is already in history

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

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