Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb

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

Change-Id: Iad13ce7ee56cf7d85a896f48d4b5af0c5df29220