DO NOT MERGE: Update DrawableStateView to be able to remove drawable states

Bug: 177233240
Test: Manually
Change-Id: I9fef0ea502c42a726a27fe88677a0f9e4a3a9fdc
(cherry picked from commit d054cf78c4b12ebf86c52fa8c7bf80b87aa744f0)
6 files changed