Merge "More KeyMint VTS testcases" am: 3368b3c6b0 am: f8991afa01

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

Change-Id: Ie69fd95c64e89360757e889ae4819c0ac5b275d9