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

This reverts commit 7016937409fcfc0301f176969303076d5e0beaba.

Reason for revert: didn't help.

Original change's description:
> 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}

TBR=bpastene@chromium.org,jbudorick@chromium.org

Change-Id: I5b874798e1dd3540a37bec11f469410edf5543c4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 790202
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1680098
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#672956}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 89993646eedd2e8bed96c3f6f0ef70994f5f2764
1 file changed