White House says Colombia agrees to take deported migrants after Trump tariff showdown