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

Change-Id: I775a7c5ae4b6aaac3d3f6604a1b727e6ab9e2f91