[automerger skipped] Merge "Merge "AOSP builds do not support Device ID attestation" into pie-vts-dev am: 78c0e32983" am: 5239def81b
am: e7d8db4b41  -s ours

Change-Id: Iefb2ff17592a5bcac8a5d2d30050744dbeae064c