Rising tensions between Washington and Beijing have led firms to diversify supply chains away from China even as they maintain a presence in the country.