Merge changes Ic8949e22,Ia3a6363d

* changes:
  Update DeviceUniqueAttestationTest to match spec
  Make AttestKeyTest not crash if no cert is returned.