Merge "Add keymaster_security_level_t for attestation." into nyc-dev