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

Change-Id: I0e9d038f4c7049b711ad1b19b729cf5bcf57b3ad