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

Change-Id: I72a673a29f979ef87d789af4993a80c81bdb67d8