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

Change-Id: Ie645bb48bfa06b3e3dc7dbfc722dcb0bdf5a8977