Also keep in mind that the writers of Endgame were also the writers/creators of Agent Carter tv series.I was under the impression that the writer of Endgame said Cap stayed in the past of the main timeline. Either way, they definitely didn't make it clear in the movie what exactly went on with Cap.
Edit: Okay I looked it up. Seems the writers and directors openly disagree on this point. Interesting.