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