Merge "KeyMint: make test more robust to variations" into main am: d8693389c5 am: 9af151b926

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

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