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

* commit '2ff71cdecb5a5209edb8afe0f617e60199e8ef74':
  Avoid infinite loop in AppCompatDrawableManager

Change-Id: Iaeae0fb229c3d7e6e46facaa25819c8bafd8bf29