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

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

Change-Id: I26ba17cbce53b0d0cfe72676aae1bf3b1e843d6b