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

Change-Id: I8c54e7907b686f333c9d0829a47b7cef371b47b5