Detroit launches new water affordability plan based on income and usage