Merge "Device ID attestation: Add feature flag." into pi-dev am: 55d4747f83
am: 5468bd8ee8

Change-Id: I571dbd2d762c47c1fc3a0de51abff57eef58608c