Ensure partial aggregation outputs match layout#135813

dnhatn merged 3 commits intoelastic:mainelastic/elasticsearch:mainfrom

dnhatn:avoid-regenerate-agg-statednhatn/elasticsearch:avoid-regenerate-agg-stateCopy head branch name to clipboard