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

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

Change-Id: I270cf463e798f834bbc278bdc1742f623b44d831