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

Change-Id: Ia521adc771065cc92ad39e824c1c1bf528cdee40