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

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1665681

Change-Id: I05e5471e68e3260057d410635a8b113fd4dd2cc0