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

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

Change-Id: I5f0d553b063ca8d0bb1d2bfb4fea70c373b4bd92