Merge "Increase timeout in testNativeWatchdogTriggersRollback"