[automerger skipped] Merge "Mark 24Q4 as merged in aosp-main-future" into aosp-main-future am: 997d053e39 -s ours

am skip reason: Merged-In I6000acc602b99d3cc6f0b7cc5b08c195d3be8a92 with SHA-1 fa727c04cf is already in history

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

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