Merge "Do not reboot with commit failure when ext4 userdata is wiped" am: 45a3d47f am: 843bda7f

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



Change-Id: Ic3ff82d3829e522d5a02d45e2d884133ff1b1a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>