Merge "Remove HWC trace from default surface traces." into rvc-dev