Merge "Merge "Avoid infinite loop in AppCompatDrawableManager" into nyc-dev am: 2ff71cdecb am: ec72c35359" into nyc-mr1-dev-plus-aosp
am: 1a7df43065

* commit '1a7df43065ef303dc32f689b446cf41e4e5a5148':

Change-Id: I340001012d292720762a92fc7d3509f5602b5d68