President Trump’s televised speech was filled with dire threats against Iran, to be sure, but ended with an olive branch and seemed designed to defuse the military confrontation between the two countries.