Legend returns: Ex-Roland Garros champ to present the trophy to Alexander Zverev or Flavio Cobolli after the final