Merge "SurfaceFlinger: retain the sideband layer information for composition"
am: 13286c3b51

Change-Id: I1f6da21a5e3401e05cb5be3c87d56503f7d6de98