[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: eb6960e3 -s ours

am skip reason: Merged-In I8efef8efbc9f01e1177fbe3105513166ad90d22f with SHA-1 f428f9e6 is already in history

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



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