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