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

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

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