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

Change-Id: I9e8a692191b7f0ed35d146e534ac1b9211ba2679