Merge changes I72734267,I66ef7a72 am: 6ace0c8ba0

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

Change-Id: I23ecce1614673146253c000c71701e32c2d9e10c