Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."