The agreement marks a major de-escalation of the trade war between the world's two biggest economies.