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

Change-Id: Ifebbb8a062997a369789f6ff11a5f2cc8e393e21