Merge "Fix nonce uniqueness tests" into main am: 8d333ff410 am: 2abfe4abc7 am: 6187565c08 am: 88a2b9d431

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

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