Android: Increase timeout for fetching tests.

This is timing out for me when I use run_chrome_public_test_apk with a filter,
on a nexus 5 device.

There may be a better place to put the timeout, any suggestions welcome :)

Change-Id: Iac12a7843bfa299471ba7b2522de367a82793b5d
Reviewed-on: https://chromium-review.googlesource.com/805136Reviewed-by: Yoland Yan <yolandyan@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524720}

build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -638,11 +638,11 @@ class LocalDeviceInstrumentationTestRun(
           extras['log'] = 'true'
           extras[_EXTRA_TEST_LIST] = dev_test_list_json.name
           target = '%s/%s' % (test_package, junit4_runner_class)
-          kwargs = {}
+          timeout = 120
           if self._test_instance.wait_for_java_debugger:
-            kwargs['timeout'] = None
+            timeout = None
           test_list_run_output = dev.StartInstrumentation(
-              target, extras=extras, retries=0, **kwargs)
+              target, extras=extras, retries=0, timeout=timeout)
           if any(test_list_run_output):
             logging.error('Unexpected output while listing tests:')
             for line in test_list_run_output: