Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 am: e060cdadc8 am: 2337e51f11
am: a4fa877840

Change-Id: Ide69733304ed0f1ca51cb36df3a2da42d7b2997a