Merge changes I8d2bd67d,I704522b2 am: 27f3ab89d0

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

Change-Id: I28ef08b0fe9b3c94b02769f43e21f574e524da57