[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 7b3aac9d05 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic3e5137a567c4180dc1454e541f3177096bc34a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>