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

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

Change-Id: I4a200d3c4f5d84c1981130b02557fa65cb290fd6