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

* commit 'ddf32f2ae1d660e520139f9e742319c9489487a3':
  Avoid infinite loop in AppCompatDrawableManager

Change-Id: I4ccacab91865a468c2094be3bc6e57537fd72811