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

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

Change-Id: Ia5d30ca70429742ba2f59ced83db5f6ba8d8d75b