Merge "Allow device properties attestation in attestKey" am: a2ff64573e

Change-Id: I50edab331353b9d1b865aa87cd8c827bfa49b64b