New York Reaches Agreement to End Battle over Stop-and-Frisk