[Android] Add option to override test in-progress timeout for amp.

build/android/pylib/remote/device/remote_device_environment.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Environment setup and teardown for remote devices."""
 
 import distutils.version
 import json
 import logging
 import os
@@ skipping 106 matching lines @@
         self._remote_device_os, args.remote_device_os, 'remote_device_os')
     self._remote_device_timeout = command_line_override(
         self._remote_device_timeout, args.remote_device_timeout,
         'remote_device_timeout')
     self._results_path = command_line_override(
         self._results_path, args.results_path, 'results_path')
     self._runner_package = command_line_override(
         self._runner_package, args.runner_package, 'runner_package')
     self._runner_type = command_line_override(
         self._runner_type, args.runner_type, 'runner_type')
+    self._timeouts["in-progress"] = command_line_override(
+        self._timeouts["in-progress"], args.test_timeout, 'test_timeout')
 
     if args.api_key_file:
       with open(args.api_key_file) as api_key_file:
         temp_key = api_key_file.read().strip()
         self._api_key = command_line_override(
             self._api_key, temp_key, 'api_key', print_value=False)
     self._api_key = command_line_override(
         self._api_key, args.api_key, 'api_key', print_value=False)
 
     if args.api_secret_file:
@@ skipping 216 matching lines @@
   def trigger(self):
     return self._trigger
 
   @property
   def verbose_count(self):
     return self._verbose_count
 
   @property
   def device_type(self):
     return self._device_type