DO NOT MERGE - Merge ab/7272582 am: 1c79e144d5 am: 0bd6aa1328

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

Change-Id: I9501c4abe503d3f6e362949e863f8c619bd85087