From an alliance during Trump’s first term, to tension, and now a renewed but cautious strategic partnership, a look at their relationship