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

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

Change-Id: I62f8835572ec93c4808b9af26b39dc0fbe22fe91