Snap for 8292457 from 9658abcecbfc2d9da3a91a8020de7bf294345fb1 to android12-tests-release
Change-Id: Ia92da2757b437814af3cb90feb1a9b3738643ee4
diff --git a/test/test_helper.h b/test/test_helper.h
index 4ac4c46..9f03bb6 100644
--- a/test/test_helper.h
+++ b/test/test_helper.h
@@ -48,7 +48,7 @@
// This value has been bumped to 10s in Oct 2020 because the x86 cuttlefish
// emulator is sensibly slower (up to 10x) than real hw and caused flakes.
// See bugs duped against b/171771440.
-constexpr uint32_t kDefaultTestTimeoutMs = 10000;
+constexpr uint32_t kDefaultTestTimeoutMs = 30000;
// This is used only in daemon starting integrations tests.
class ServiceThread {