Merge changes Ibc7851ba,Ie743cff7

* changes:
  Cache the KeystoreKeyBackend with a lazy static.
  Implement Keystore 2.0 access control
diff --git a/keystore2/src/android_security_keystore2.rs b/keystore2/src/android_security_keystore2.rs
index 1969ed5..421885f 100644
--- a/keystore2/src/android_security_keystore2.rs
+++ b/keystore2/src/android_security_keystore2.rs
@@ -1219,6 +1219,7 @@
           pub(crate) mod mangled { pub use super::ResponseCode as _7_android_8_security_9_keystore2_12_ResponseCode; }
         }
         pub mod Result {
+          #[derive(Debug, Copy, Clone, Eq, PartialEq)]
           pub struct Result {
             pub rc: crate::mangled::_7_android_8_security_9_keystore2_12_ResponseCode, 
             pub errorCode: crate::mangled::_7_android_8_hardware_7_keymint_9_ErrorCode,