President Trump threatened 5 percent tariffs on Mexican imports over a water dispute. Mexico’s president, Claudia Sheinbaum, wants an agreement instead.