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

am skip reason: Merged-In I2a904a81130ec40602ac7e44e1b1435cd1d54d8f with SHA-1 6b083c65dc is already in history

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

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