REVERT LATER: power_Resume: allow an extra grace period for TPM issues

The TPM seems to be taking several seconds to suspend on some lab
systems. This allows us to avoid the SuspendWarning and collect data
anyway when this happens.

BUG=chromium:468809
TEST=run power_Resume, verify that it works

Change-Id: I4a61750fa329f9f8e79e00047aa98ebccc3be311
Previous-Reviewed-on: https://chromium-review.googlesource.com/263596
(cherry picked from commit 833c26fa0af2999167e7245bfa553cfbd9a8af77)
Reviewed-on: https://chromium-review.googlesource.com/264065
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Commit-Queue: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
1 file changed