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

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