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