Merge "Handling `UNIMPLEMENTED` error code from deleteKey API in Keystore VTS Tests." into main am: 6bca9237b8

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

Change-Id: Ia9dd867daf37c6762eb815c1b5954b060cefb11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>