Merge "Avoid infinite loop in AppCompatDrawableManager" into nyc-dev am: 2ff71cdecb am: ddf32f2ae1
am: 702eda744e

* commit '702eda744e44a125af2cd7a3868f1c50b48c02fc':
  Avoid infinite loop in AppCompatDrawableManager

Change-Id: I68208604b228855f0bbf0dd6af48c9bd3d981e79