DO NOT MERGE Do not call drawableChanged pre Q am: 843f9dee8b
am: 2106ef79ad

Change-Id: Ic5ceb704346deb38d1151f0e1fdc79fbb28ff82d