Merge "[SurfaceFlinger] Add hwc information to winscope:" into rvc-dev am: d45b96e21f am: b0d5151a21

Change-Id: I5322b5e1887c30ec10000e6495c869f77e5f79e2