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

Change-Id: I86ca390b34f5577962f162565e8a2318bf49d94b