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

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

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