Merge "Add trace category for adb." am: 6968d90dc5
am: 15dc5951e6

Change-Id: I1e60464308807f09a4d89ee4c0fc1a007fb1be88