Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 557c037ed8

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3533600

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