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

Change-Id: Id54fa3b2327faec88c936228109643c8425eeb2a