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

Change-Id: I6cbb25d0aa1deccb1b15ce9e2a13b6df0db5294b