[1.5.x] Fixed #21126 - Properly align resolve_columns fields for aggregates

The 'row' passed to resolve_columns includes aggregate values, but
'fields' did not. This resulted in backends incorrectly aligning the
fields and values. 'fields' now includes None placeholders for each
aggregate value in the row.