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

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

Change-Id: Id190ecb42abd8311c115a2d6b2e5fba9e28243c7