Merge "Add trace category for adb." am: 6968d90dc5 am: 15dc5951e6 am: 96446b5bd3
am: 19c4422c7c

Change-Id: I33a39902df365cf60cd5976d7977e18d36c09bc0