Fix flaky testEnableRollbackTimeoutFailsRollback test
am: 1d66bf8c48

Change-Id: Id8c792c9a0926fbd7b8e287c6547eb250caca5fb