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

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

Change-Id: I1e7031e758bd9a503f7368f84157daaa715daf24