[release-20.0] Fix subquery planning having an aggregation that is used in order by as long as we can merge it all into a single route (#16402)#16408