Yes, Finnick was Annie's mentor. Having won the 65th Hunger Games, Finnick worked as a mentor to all District 4 tributes that came after him, including Annie.