Merge "Keystore 2.0 permissions.rs: Use generated aidl types."