[automerger skipped] Merge "vold: Reboot if vold failure" into sc-v2-dev am: 1d49ec7aab -s ours am: 356b107b73 -s ours

am skip reason: Merged-In Ic56acd9cc906b0166adf805023e34bbd6b3648a5 with SHA-1 c73dbac02d is already in history

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

Change-Id: If5f94f5c2a4f559fc260ee36be3d07dfd47b8c64