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

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

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