[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: 9ae0d2a3 -s ours am: b8711a54 -s ours am: 0a071455 -s ours am: 30496487 -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: I2282022e3a68db285cd52bdcb815048d83fb430c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>