The pair's last match-up on the surface came at the French Open final in 2015, won by Wawrinka in four sets