[automerger skipped] DO NOT MERGE Do not call drawableChanged pre Q am:...
[automerger skipped] DO NOT MERGE Do not call drawableChanged pre Q am: 843f9dee am: 605e74c9 am: 5b35983b
am: 242c4880 -s ours
am skip reason: subject contains skip directive
Change-Id: If3c93626c376dacab72ec37e1a864b7bb6b5a86d