Merge "KeyMaster: restore device_unique_attestation"