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

Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1