Merge "Add AppCompatDrawableManager" into mnc-ub-dev