Merge "atrace.rc: tracing should be disabled by default."
am: cbd4cc737c

* commit 'cbd4cc737cc99b2ae7ac22ca4b2bb52b86b8e6ae':
  atrace.rc: tracing should be disabled by default.