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

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

Change-Id: I18b24e66f4f386599a5f17b7477bf95ca33837b6