Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future am: d0cd40f22f

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

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