Merge "Adding tests to verify `EVP_PKEY_from_keystore2` API [Keystore2-engine]." am: 96947c9d89

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

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