Merge "Fix AttestKeyTest failures in KeyMint VTS" into android13-tests-dev am: c3702f8e5b

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

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