Merge "surfaceflinger: fix screenshot dataspace under WCG" into pi-dev am: 1387ea90a1
am: 901545a504

Change-Id: I3e780aba2bbe6b963ebf56a29329b0d556d09b17