Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev