Revert of [Android] Disable mid perf run device recovery on n7 devices.

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

 # Copyright 2016 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.
 
 import collections
 import io
 import json
 import logging
 import os
 import pickle
@@ skipping 234 matching lines @@
           result_type = self._RunSingleTest(test)
         except device_errors.CommandTimeoutError:
           result_type = base_test_result.ResultType.TIMEOUT
         except device_errors.CommandFailedError:
           logging.exception('Exception when executing %s.', test)
           result_type = base_test_result.ResultType.FAIL
         finally:
           self._TestTearDown()
           if result_type != base_test_result.ResultType.PASS:
             try:
-              # TODO(rnephew): Possible problem when restarting on N7 devices.
-              # Determine if this is true. crbug.com/667470
-              if 'Nexus 7' not in self._device.product_model:
-                device_recovery.RecoverDevice(self._device, self._env.blacklist)
-              else:
-                logging.critical('Not attempting device recovery.')
+              device_recovery.RecoverDevice(self._device, self._env.blacklist)
             except device_errors.CommandTimeoutError:
               logging.exception(
                   'Device failed to recover after failing %s.', test)
           tries_left -= 1
 
       results.AddResult(base_test_result.BaseTestResult(test, result_type))
     return results
 
   def _LogTestExit(self, test, exit_code, duration):
     logging.info('%s : exit_code=%d in %d secs on device %s',
@@ skipping 270 matching lines @@
   # override
   def _RunTest(self, _device, _test):
     raise NotImplementedError
 
 
 class TestDictVersionError(Exception):
   pass
 
 class PerfTestRunGetStepsError(Exception):
   pass