DO NOT MERGE Do not call drawableChanged pre Q am: 843f9dee8b
am: 605e74c930

Change-Id: I4543bd9c504a3d57e81ac17e708f4b50df8cff55