Merge "logd: disable flaky logd.timeout test" into rvc-dev am: 090eb40355 am: 45339b236d

Change-Id: Iffa181f87f782d6f228906580c133a46152da989

logd/tests/logd_test.cpp

@@ -582,6 +582,7 @@ TEST(logd, timeout_start_epoch) {
         "dumpAndClose lids=0,1,2,3,4,5 timeout=6 start=0.000000000");
 }
 
+#ifdef ENABLE_FLAKY_TESTS
 // b/26447386 refined behavior
 TEST(logd, timeout) {
 #ifdef __ANDROID__
@@ -716,6 +717,7 @@ TEST(logd, timeout) {
     GTEST_LOG_(INFO) << "This test does nothing.\n";
 #endif
 }
+#endif
 
 // b/27242723 confirmed fixed
 TEST(logd, SNDTIMEO) {