Merge "DO NOT MERGE Do not call drawableChanged pre Q am: 843f9dee am: 605e74c9" into qt-r1-dev-plus-aosp