Merge "trusty: keymaster: set_attestation_key: Change wrapped key"