[automerger skipped] KeyMint VTS: improve attestation tests am: a676c3b4ef am: 0a24922361 -s ours

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

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

Change-Id: I21b9d44b16c64a355398d19a3e79c572278501e9