[automerger skipped] KeyMint VTS: improve attestation tests am: a676c3b4 am:...

[automerger skipped] KeyMint VTS: improve attestation tests am: a676c3b4 am: 0a249223 -s ours am: 0397dbff -s ours

am skip reason: Merged-In Ibaed7364c6d08c0982e2a9fb6cb864ae42cf39fe with SHA-1 03346e17 is already in history

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

Change-Id: I928c8ad959b066700b5ebcebb5c51ff51bbfb0a7