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

Change-Id: I1d354df518f19d61eaa17e03fd696193464b6f7b