Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0

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

Change-Id: I0a3dd874fd00d7b35a47ed1067836b597f5961ca