[NOT FOR COMMIT] Revert Disable TsProxy on Android

telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py

Index: telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
diff --git a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
index 05c425c28fb5fd088496ba558c2262d216543e54..cd9149372c5265448fb401447c21dff1bd76e196 100644
--- a/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
+++ b/telemetry/telemetry/internal/backends/chrome/chrome_browser_backend.py
@@ -125,12 +125,17 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend):
     network_backend = self.platform_backend.network_controller_backend
     if not network_backend.is_initialized:
       return []
-    proxy_port = network_backend.forwarder.port_pair.remote_port
-    replay_args.append('--proxy-server=socks://localhost:%s' % proxy_port)
     if not network_backend.is_test_ca_installed:
       # Ignore certificate errors if the platform backend has not created
       # and installed a root certificate.
       replay_args.append('--ignore-certificate-errors')
+
+    replay_args.append('--host-resolver-rules=MAP * %s,EXCLUDE localhost' %
+                       network_backend.host_ip)
+    http = network_backend._wpr_http.remote_port
+    https = network_backend._wpr_https.remote_port
+    replay_args.append('--testing-fixed-http-port=%s' % http)
+    replay_args.append('--testing-fixed-https-port=%s' % https)
     return replay_args
 
   def HasBrowserFinishedLaunching(self):