[Telemetry] Move from telemetry WaitFor to py_utils WaitFor

telemetry/telemetry/internal/story_runner.py

Index: telemetry/telemetry/internal/story_runner.py
diff --git a/telemetry/telemetry/internal/story_runner.py b/telemetry/telemetry/internal/story_runner.py
index 590ccd7c9de8e68fa91b752def4181ab854303cc..84e01a387e9972b41485cefc8d07980fc3f532af 100644
--- a/telemetry/telemetry/internal/story_runner.py
+++ b/telemetry/telemetry/internal/story_runner.py
@@ -8,6 +8,7 @@ import os
 import sys
 import time
 
+import py_utils
 from py_utils import cloud_storage  # pylint: disable=import-error
 
 from telemetry.core import exceptions
@@ -87,7 +88,8 @@ def _RunStoryAndProcessErrorIfNeeded(story, results, state, test):
     if isinstance(test, story_test.StoryTest):
       test.Measure(state.platform, results)
   except (legacy_page_test.Failure, exceptions.TimeoutException,
-          exceptions.LoginException, exceptions.ProfilingException):
+          exceptions.LoginException, exceptions.ProfilingException,
+          py_utils.TimeoutException):
     ProcessError()
   except exceptions.Error:
     ProcessError()