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

Change-Id: I5986acc1763572143fd475101b065c946662e34e