Merge "Merge "AOSP builds do not support Device ID attestation" into pie-vts-dev am: 78c0e32983"
am: 5239def81b

Change-Id: I1cce3f0e8992326ac4cda516f1b5740155ef626e