[automerger skipped] Merge "surfaceflinger: force client composition for Y410" into pi-dev am: b583b3bb01
am: e10966bc85  -s ours

Change-Id: Ice8981b1d74024d259fabfda268eb7cfa9a20779