Bounding Counterfactual Demand with Unobserved Heterogeneity and Endogenous Expenditures