Merge "Add atrace_userdebug.rc to enable some tracepoints for userdebug only." into oc-dev