Merge "Remove HWC trace from default surface traces." into rvc-dev am: 1032fac2f7 am: 0e90cf199a

Change-Id: I9e8071f5d2c3e22ac27bc4ab6176ce5423266ff7