Change pre-aggregation steps to aggregate both states
Change pre-aggregation steps to aggregate both states

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq