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

Change-Id: I068e661eba9c7e668a6157dc4d704b4b73e8514c