AT&T settles New York City lawsuit, to let shareholders vote on diversity proposal