Merge "Device ID attestation: Add feature flag." into pi-dev am: 73961397e5
am: 1352861682

Change-Id: I564a99552bd1292dcc0dc85add1b836de028f85f