[automerger skipped] Merge "Merge "DO NOT MERGE Do not call drawableChanged pre Q" into qt-dev am: d007c7b90d am: cbacbea8fa" into qt-r1-dev-plus-aosp am: 1753f782c5
am: 995fd10afb -s ours
am skip reason: subject contains skip directive

Change-Id: I409f31a55dc09335b4d54694c376dc887916c74e