[Backport] topn with granularity regression fixes#17580

cryptoe merged 2 commits intoapache:31.0.1apache/druid:31.0.1from

clintropolis:backport-17565-to-31.0.1clintropolis/druid:backport-17565-to-31.0.1Copy head branch name to clipboard