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

Change-Id: I3d6e8c80f8a1a745060891984aacf8bd121b3be3