Refactored TimeoutRedirectResetsOnActivity tests.

-Added RetryOnFail test rule.

Change-Id: I0b2cd5af0a144c29855c3ba1e158ba54900a9523