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