The China-Japan trade war is pretty much over—for now