For months, bubbling trade tensions between China and the U.S. seemed to calm to a simmer, with words like “thaw” and “truce” ...