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

Change-Id: I89f1e3173c085c9c46def09d07e6c3e7719437cf