Merge "Skip device id attestation tests on devices receiving only system update and not vendor update, on such devices `android.software.device_id_attestation` feature may not be configured correctly." into main