Fix flaky testEnableRollbackTimeoutFailsRollback test am: 1d66bf8c48
am: 79e8fcb4ae

Change-Id: I31b624dfc1a828ba70f3f5780777ee9b3a2902b8