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

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

Change-Id: I2065c251056818750eb063d69dba871a418dbced