Trump announces U.S. trade deal with Japan, keeps tariffs