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

Change-Id: Ia5c148adbe6eebcc3d444844e7e67283d1a07403