android: double reboot timeout after verity change in asan setup/teardown.

Bug: 790202
Change-Id: Icc71bbb03f782e346356c8b8f6eb2124b94fc493
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1678762
Auto-Submit: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672750}

tools/android/asan/third_party/with_asan.py

@@ -64,7 +64,10 @@ def Asan(args):
           logging.info('disable-verity output:')
           for line in verity_output.splitlines():
             logging.info('  %s', line)
-        device.Reboot()
+        # Wait an unusually long time to ensure that the device has time
+        # to come back after disabling verity + get re-added to the container
+        # on swarming. Context: http://shortn/_Mg3YuiSftf
+        device.Reboot(timeout=600)
       # Call EnableRoot prior to asan_device_setup.sh to ensure it doesn't
       # get tripped up by the root timeout.
       device.EnableRoot()
@@ -88,7 +91,10 @@ def Asan(args):
           logging.info('enable-verity output:')
           for line in verity_output.splitlines():
             logging.info('  %s', line)
-        device.Reboot()
+        # Wait an unusually long time to ensure that the device has time
+        # to come back after disabling verity + get re-added to the container
+        # on swarming. Context: http://shortn/_Mg3YuiSftf
+        device.Reboot(timeout=600)
 
 
 def main(raw_args):