Merge "Keystore: Fix Device ID attestation test."