Merge "More KeyMint VTS testcases" am: 3368b3c6b0

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

Change-Id: Iaeae2f4fc574defd77ead2f8c0a14523eeabfde4