Update from https://crrev.com/303153

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index ebd2c83515d96bd7d7e59bd264d4642d23fc72ba..3bac503b0659cd52b091897d6ef70df5b71e27a4 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -185,6 +185,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
     self._SetupIndividualTestTimeoutScale(test)
     self.tool.SetupEnvironment()
 
+    if self.flags and self._IsFreTest(test):
+      self.flags.RemoveFlags(['--disable-fre'])
+
     # Make sure the forwarder is still running.
     self._RestartHttpServerForwarderIfNecessary()
 
@@ -196,6 +199,18 @@ class TestRunner(base_test_runner.BaseTestRunner):
       self.coverage_host_file = os.path.join(
           self.coverage_dir, coverage_basename)
 
+  def _IsFreTest(self, test):
+    """Determines whether a test is a first run experience test.
+
+    Args:
+      test: The name of the test to be checked.
+
+    Returns:
+      Whether the feature being tested is FirstRunExperience.
+    """
+    freFeature = 'Feature:FirstRunExperience'
+    return freFeature in self.test_pkg.GetTestAnnotations(test)
+
   def _IsPerfTest(self, test):
     """Determines whether a test is a performance test.
 
@@ -238,6 +253,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
 
     self.TearDownPerfMonitoring(test)
 
+    if self.flags and self._IsFreTest(test):
+      self.flags.AddFlags(['--disable-fre'])
+
     if self.coverage_dir:
       self.device.PullFile(
           self.coverage_device_file, self.coverage_host_file)