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