US, China deal aims to simmer long-running trade tensions