Merge changes Idc575106,Id6457a2b am: 3e0e53dbe5

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

Change-Id: If01239e184cd19de660fa158d599c9826ea0cf71