Merge "AOSP builds do not support Device ID attestation" into pi-dev
am: 28813ecfd2

Change-Id: Iaca98cf57f4e797a610bc8630aa079207c8e3c54