Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0 am: d9f2335ab7 am: 64ce88543b

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

Change-Id: I8f5108e4e46f5657e24523c5346dbab175d9e5e8