Merge "Fixing a test in DeviceUniqueAttestationTest" into stage-aosp-rvc-ts-dev