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

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

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