refactor(agg): separate semantics of AggKind
and AggType
#18640
Merged
AggKind
and AggType
#18640