Merge "SurfaceFlinger: retain the sideband layer information for composition" am: 13286c3b51 am: 8d5eb54030 am: 436f8421ed
am: b69a5c39b5

Change-Id: I4eda2768e0f8cd2403492cd3308ddf1fa0d014e4