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

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

Change-Id: I6b77a17874d042c6ec322b7a770149e75340a915