Merge "vold: Reboot if vold failure" am: 319f778edc am: 05562f4a93 am: 9a6022acac

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

Change-Id: Idf48a6fe8182ff9289b3b9509aaae8b383367210