Merge "atrace: introduce tracing category for adb." am: 3c9a97902d
am: 0deeeac8d1

Change-Id: I73946e269c69e15974b5a74693063b0c12b13f4e