[NOT FOR COMMIT] Revert Disable TsProxy on Android

telemetry/telemetry/internal/forwarders/android_forwarder.py

Index: telemetry/telemetry/internal/forwarders/android_forwarder.py
diff --git a/telemetry/telemetry/internal/forwarders/android_forwarder.py b/telemetry/telemetry/internal/forwarders/android_forwarder.py
index d4afe19baf49a342f75672f15158b5985ac02713..0ca959dcf813a8c502667a899f554a2133a48e0f 100644
--- a/telemetry/telemetry/internal/forwarders/android_forwarder.py
+++ b/telemetry/telemetry/internal/forwarders/android_forwarder.py
@@ -20,9 +20,9 @@ class AndroidForwarderFactory(forwarders.ForwarderFactory):
     super(AndroidForwarderFactory, self).__init__()
     self._device = device
 
-  def Create(self, port_pair):
+  def Create(self, http_ports, https_ports):
     try:
-      return AndroidForwarder(self._device, port_pair)
+      return AndroidForwarder(self._device, http_ports, https_ports)
     except Exception:
       try:
         logging.warning('Failed to create forwarder. '
@@ -53,20 +53,26 @@ class AndroidForwarderFactory(forwarders.ForwarderFactory):
 
 class AndroidForwarder(forwarders.Forwarder):
 
-  def __init__(self, device, port_pair):
-    super(AndroidForwarder, self).__init__(port_pair)
+  def __init__(self, device, http_ports, https_ports):
+    super(AndroidForwarder, self).__init__(http_ports)
     self._device = device
-    forwarder.Forwarder.Map(
-        [(port_pair.remote_port, port_pair.local_port)], self._device)
-    self._port_pair = (
-        forwarders.PortPair(
-            port_pair.local_port,
-            forwarder.Forwarder.DevicePortForHostPort(port_pair.local_port)))
+    forwarder.Forwarder.Map([
+      (http_ports.remote_port, http_ports.local_port),
+      (https_ports.remote_port, https_ports.local_port)], self._device)
+    self.http_ports = forwarders.PortPair(
+      http_ports.local_port,
+      forwarder.Forwarder.DevicePortForHostPort(http_ports.local_port))
+    self.https_ports = forwarders.PortPair(
+      https_ports.local_port,
+      forwarder.Forwarder.DevicePortForHostPort(https_ports.local_port))
+    self._port_pair = self.http_ports
     atexit_with_log.Register(self.Close)
     # TODO(tonyg): Verify that each port can connect to host.
 
   def Close(self):
     if self._forwarding:
       forwarder.Forwarder.UnmapDevicePort(
-          self._port_pair.remote_port, self._device)
+          self.http_ports.remote_port, self._device)
+      forwarder.Forwarder.UnmapDevicePort(
+          self.https_ports.remote_port, self._device)
     super(AndroidForwarder, self).Close()