[automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into...

[automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292a am: 198bcf3a -s ours am: 9f1f92c4 -s ours am: fe823a11 -s ours am: 021ae22f -s ours am: 79b6d84c -s ours am: 88f06d63 -s ours

am skip reason: Merged-In I8199e5c7570b10b71f127c7439b889c0b3327865 with SHA-1 981c9c22 is already in history

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



Change-Id: I96c4c0fb44d0e24c4bf60f95b3f0f6c0bc8ab1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>