Merge "Add KM_TAG_ATTESTATION_CHALLENGE." into nyc-dev