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

Change-Id: I6afbc7914107f73ea4b991b17a1eafded244109a