Violence along the border between the two tumultuous countries flared up in recent weeks, stoked by a dispute over the water flowing from Afghanistan’s Helmand river into Iran.