Did WWE Tease a Possible Shawn Michaels vs Undertaker Match On WWE Raw This Week?

As seen on WWE Raw this week, The Undertaker made his surprise return to WWE TV and confronted Shawn Michaels in the ring.
Fans speculated following the segment that WWE was teasing possible match between Michaels and Undertaker when The Dead Man asked HBK if he was retired or simply scared to face ‘Taker.
Dave Meltzer noted on Wrestling Observer Radio today that the hard rule of thumb in WWE is that storylines or possible angles are not to be pushed hard on TV if there is no payoff planne