China and the United States announced a truce in their trade war on Monday after talks in Geneva that will roll back the bulk of tariffs and other countermeasures by Wednesday.