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

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

Change-Id: I6c02476241f561c7cc1032bb23f6755fafcadbdc