Merge "Fixing a test in DeviceUniqueAttestationTest" into stage-aosp-rvc-ts-dev am: 37b752ed99 am: 9e5e724e1a

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

Change-Id: I07d0b78742ecb974cdc503d638ae3c7c34074175