China and India Rebuild Ties After Modi's Rupture with Trump