Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7

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

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