Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery.""
am: ca10ecb3ae

Change-Id: Ib906e393d8d2226083f23503c7eb1f96c58bbcf1