Merge "KeyMint VTS: don't crash on invalid patchlevel" am: e1152b6390 am: 4e9cab823d am: 69d66e13db

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

Change-Id: Ifa9c2210c18cc0000a63cd8d16b02f4d71e16256