Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev