US government officials have reached a deal to lift a 25% tariff that former President Donald Trump imposed on imported Japanese steel.