Merge "Keystore 2.0: Fix permission check for device attestation."