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

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

Change-Id: I1807a992b19e8f8fffd7425a5cc390e358b7c0d8