am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev

* commit 'd02b00dd6efd3841708cd72ae08e5d548b8cd07b':
  Fix UsbDebuggingActivity not shown in adb tcpip mode