Merge "AOSP builds do not support Device ID attestation" into pi-dev