Merge "Include challenge in test_rkpd_attestation_key_upgrade" into main