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

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

Change-Id: I559ffd0182bf84090613a9ac8f4132f30420a9e0