Merge "Keystore 2.0: Introduce deleteKey to IKeystoreSecurityLevel" am: f18f82af7d am: d97f934cd8

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1623126

Change-Id: I77fbcb839038b037997fe249e23694a1df65212e