Merge "Do not reboot with commit failure when ext4 userdata is wiped" am: 45a3d47fd5 am: 843bda7ff7 am: 02eaf2e26c

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

Change-Id: Ic756852537a6204533ddcb5618bdc3879822d8a5
Signed-off-by: Automerger Merge Worker <[email protected]>