United Parcel Service Inc. and a Black former UPS vice president have ended her claims that the company fired her after ...