Merge "keygen test not generating the key for every iteration" into main am: c2723cdea3 am: b0c20fba97

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

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