Merge "[Winscope] Add chips for HWC vs GPU composited layers" into rvc-dev