Merge "KeyMint VTS: enable patchlevel checks" am: 8fb4a1c82e am: 22a5ccd132 am: a9bedb53da

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1840175

Change-Id: Ibd5dd731e65c7c49880c5541ad9af53b3e4ec3a9