Merge "Fix nonce uniqueness tests" into main am: 8d333ff410 am: 2abfe4abc7

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

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