[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 1c79e144d5 am: 0bd6aa1328 am: a63ab5e7e0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied712d4cca18855f49241ff5125cf05322177d04