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

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