Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
am: b9ee9abebe

Change-Id: I46fd5105be75661eb74ab17528e03ac420e022dc