[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 76705d193a -s ours am: 55cdc4e43b -s ours

am skip reason: Merged-In I66f4c83c597d58648d56b95f55f3091a1bb550be with SHA-1 8387095809 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Mms/+/3514736

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