Merge "Keystore 2.0: Implement delete_key in IKeystoreSecurityLevel"