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

Change-Id: Id3f4ec526f9a60086c5f984e26f3d1f7e3167d0d