Merge "KeyMint VTS: strict test only for v2+" am: d057fc0cb6

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

Change-Id: I18f6f997439f31ea4d2a95deffe318d07f9048b9