Merge "Distinguish redactions from the string "REDACTED" in formatRedactedTrace"