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