[automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7 am: 198bcf3a6d -s ours am: 9f1f92c4a8 -s ours am: fe823a11c2 -s ours am: dfb119d14e -s ours

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

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

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