[automerger skipped] Merge Android 14 am: a4f866af -s ours am: 687abb91 -s...

[automerger skipped] Merge Android 14 am: a4f866af -s ours am: 687abb91 -s ours am: 3bc14796 -s ours

am skip reason: Merged-In Ic9bc7a7971790fa19a04181b6f89a33a0088bdd8 with SHA-1 efe3c891 is already in history

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



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