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

Change-Id: I944f3c8c0b1a1f4c191cf616ddff22f67d4f2b14