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

Change-Id: I813f41905386da06e6eaebd6b7f85c17a6051456