Merge "Verify Tag::VENDOR_PATCHLEVEL key parameter if the underlying device is a KeyMint implementation." into main am: 7a0a9cf84b am: 3cd126be54

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

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