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

Change-Id: I1142e703c7cc7f3ba33d087450e7166a14640d70