Merge "Simplify keymaster_key_origin_t."