[Android] Fix uiautomator command line flag after r242933.

build/android/pylib/uiautomator/test_runner.py

 # Copyright (c) 2013 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.
 
 """Class for running uiautomator tests on a single device."""
 
 from pylib import constants
+from pylib import flag_changer
 from pylib.instrumentation import test_options as instr_test_options
 from pylib.instrumentation import test_runner as instr_test_runner
 
 
 class TestRunner(instr_test_runner.TestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
   def __init__(self, test_options, device, shard_index, test_pkg):
     """Create a new TestRunner.
 
@@ skipping 15 matching lines @@
         test_options.save_perf_json,
         test_options.screenshot_failures,
         wait_for_debugger=False,
         coverage_dir=None,
         test_apk=None,
         test_apk_path=None,
         test_apk_jar_path=None)
     super(TestRunner, self).__init__(instrumentation_options, device,
                                      shard_index, test_pkg)
 
+    cmdline_file = constants.PACKAGE_INFO[test_options.package].cmdline_file
+    self.flags = None
+    if cmdline_file:
+      self.flags = flag_changer.FlagChanger(self.adb, cmdline_file)
     self._package = constants.PACKAGE_INFO[test_options.package].package
     self._activity = constants.PACKAGE_INFO[test_options.package].activity
 
   #override
   def InstallTestPackage(self):
     self.test_pkg.Install(self.adb)
 
   #override
   def PushDataDeps(self):
     pass
 
   #override
   def _RunTest(self, test, timeout):
     self.adb.ClearApplicationState(self._package)
     if self.flags:
       if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test):
         self.flags.RemoveFlags(['--disable-fre'])
       else:
         self.flags.AddFlags(['--disable-fre'])
     self.adb.StartActivity(self._package,
                            self._activity,
                            wait_for_completion=True,
                            action='android.intent.action.MAIN',
                            force_stop=True)
     return self.adb.RunUIAutomatorTest(
         test, self.test_pkg.GetPackageName(), timeout)