Merge changes Icdff584e,I71fd98e6,If1e9e3ad,I05bc4dc9 am: 017e95fa6a am: 078a507c43 am: 54dd37692a

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

Change-Id: I6fbf578a3572365b31b70b336242884317e616f9