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

Change-Id: If7bb3a75cf88f2974bdd19851e6f7b4f7543fa80