Merge "More KeyMint VTS testcases" am: 3368b3c6b0 am: f8991afa01 am: f15bc0f935 am: 7df1d7d4f7

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

Change-Id: I7951b286549bf350e663ec6d16b6e426d07c62b3