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

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

Change-Id: Ia4c30bbc9f07b3f0613f66de934e78818150f71b