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

Change-Id: I3a2aa418e4f5ac5789957291adbaa87af9ca9f05