Merge "surfaceflinger: layer dataspace is not a state" into pi-dev
am: 62994a4795

Change-Id: Iff140a39ccd9d100814023eaa384b19cbfdf2a5e