Merge changes I72734267,I66ef7a72 am: 6ace0c8ba0 am: 1e1bade6ff

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

Change-Id: Icf3d15d3c78c68d566faeccc8da2300a4e2d4f62