Merge "Fixing a test in DeviceUniqueAttestationTest" into stage-aosp-rvc-ts-dev am: 37b752ed am: 9e5e724e am: 22e96ba3 am: d8f664a3 am: 82d94bd6

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

Change-Id: I04d6f02d659b1a8fe910d096ac7874f43cb080b1