Merge "KeyMint VTS: option to skip BOOT_PATCHLEVEL check" am: 8aeb7ef2b4 am: 8a2977f698

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

Change-Id: I870162d04f83a2d424aadf4674a7e475664fccd1