[automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours am: 24dc4748aa -s ours am: 1919d625b8 -s ours am: 169df91cca -s ours am: 0bf71b45f0 -s ours

am skip reason: subject contains skip directive

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

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