Merge "Avoid checking VENDOR_PATCHLEVEL in generated key characteristics if the underlying device is a Keymaster implementation." into main am: 255cde6f04

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

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