[automerger skipped] UserDataPreparer: reboot to recovery if preparing user...

[automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026 am: 4bf1a4ac -s ours am: aefe95db -s ours

am skip reason: Merged-In Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54 with SHA-1 5256365e is already in history

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



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