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

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

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