Merge changes Ia095340c,I464edc6e am: 3d1a532efc am: 57ca48b788

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

Change-Id: I34e28f326ac91743e1d752e4aed7172c4c76aa7e