The annual Comic-Con convention will remain in San Diego through 2021, Mayor Kevin Faulconer announced Friday. The previous agreement was set to expire after 2018.