[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70 am: d685b63f -s ours am: 39bf332a -s ours am: 7b3aac9d -s ours am: d8103629 -s ours am: acb7f4be -s ours am: 0bb0811c -s ours am: 2090d09a -s ours am: e8653dea -s ours

am skip reason: subject contains skip directive

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



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