Merge "Enabled attest-id tests to run on GSI builds as well." into main