Merge "Add OP_AUTH_NEEDED KeyStore result code"