Merge changes Ia095340c,I464edc6e am: 3d1a532efc

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

Change-Id: If66258821cd75f3ac755f89eb6aa0b69321fdf48