Merge changes I8d2bd67d,I704522b2 am: 27f3ab89d0 am: 5a9feb48fa

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

Change-Id: Ia206b84e8b2ec96882da9c51102f955161ca06f3