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

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

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