Merge "Do not set the trace clock in atrace.rc." into oc-dev am: 27ef38ca4c
am: 755b10ddc3

Change-Id: If7306d6a2bd35a392aee6e2a6951781bead7cb78