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

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

Change-Id: I40eee7cfa9cd949a3169b233341373f262643131