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

Change-Id: Iac7b13493111e9be641af778558cb8e248175fdd