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

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

Change-Id: Ie7a8d0a90d1572752b1d0458c9e115a089d96390