The meeting between Prime Minister Mark Carney and Xi Jinping, China’s top leader, came after a long period of tension and estrangement.