4 more years of Trump-China clashes, or will the tone shift?