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

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

Change-Id: I2538398321b13f8ef1b729b2f9b71d4e080798db