Merge "Merge \\"Mutate the drawable if a valid state change happen\\" into nyc-dev am: 486c76b5ef am: f509358169" into nyc-mr1-dev-plus-aosp