[automerger skipped] Merge "Merge "Brought back compatibility check for...

[automerger skipped] Merge "Merge "Brought back compatibility check for falling back on dest_out whenever clear is used as a blend mode to draw bitmaps" into qt-dev am: 1f915b0d am: 35b97a6c" into qt-r1-dev-plus-aosp
am: e1a35719 -s ours
am skip reason: change_id I56d015e773b312cac948d850ca2997d8df0cc66d with SHA1 476d0d16 is in history

Change-Id: I91dce1fa32611a0de561a467d616d524a48ee1b9