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

* commit 'ec72c353596098fb6a2e84f50623b31400e1ee2d':
  Avoid infinite loop in AppCompatDrawableManager

Change-Id: Iedccc9db48d829a7b169bcb5a2f271f438d65c28