Merge "UserDataPreparer: reboot to recovery if preparing user storage fails" am: 39d90b7a2d am: 0a3cb5df0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959659

Change-Id: I0856593c8d0f39fadedcdd3565154a036f6678f6