Android gtest runner: Only query device for test list when necessary (take 2)

build/android/pylib/gtest/gtest_test_instance.py

Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index a118ea76ceb36f7bbaac3a0d6b87437e7ebf9402..538376d724a7b1261fbd6deb6e9c60055b510f83 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -133,9 +133,9 @@ class GtestTestInstance(test_instance.TestInstance):
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
-    self._suite = args.suite_name[0]
-
+    self._extract_test_list_from_filter = args.extract_test_list_from_filter
     self._shard_timeout = args.shard_timeout
+    self._suite = args.suite_name[0]
 
     incremental_part = '_incremental' if args.incremental_install else ''
     apk_path = os.path.join(
@@ -255,6 +255,10 @@ class GtestTestInstance(test_instance.TestInstance):
   def test_arguments(self):
     return self._test_arguments
 
+  @property
+  def extract_test_list_from_filter(self):
+    return self._extract_test_list_from_filter
+
   #override
   def TestType(self):
     return 'gtest'