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

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

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