Flaky test handling for .info/connected on Android (#937)

Author: jonsimantov

database/integration_test/src/integration_test.cc

@@ -1275,11 +1275,11 @@ TEST_F(FirebaseDatabaseTest, TestInvalidatingReferencesWhenDeletingApp) {
 TEST_F(FirebaseDatabaseTest, TestInfoConnected) {
   SignIn();
 
-  // The entire test can be a bit flaky on iOS, as the iOS SDK's
-  // .info/connected is not quite perfect.
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+  // The entire test can be a bit flaky on mobile, as the iOS and
+  // Android SDKs' .info/connected is not quite perfect.
+#if defined(ANDROID) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
   FLAKY_TEST_SECTION_BEGIN();
-#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#endif  // defined(ANDROID) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
 
   firebase::database::DatabaseReference ref = CreateWorkingPath();
   // Force getting a value so that we are connected to the database.
@@ -1316,9 +1316,9 @@ TEST_F(FirebaseDatabaseTest, TestInfoConnected) {
     EXPECT_EQ(reconnected.result()->value(), true);
   }
 
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#if defined(ANDROID) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
   FLAKY_TEST_SECTION_END();
-#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#endif  // defined(ANDROID) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
 }
 
 TEST_F(FirebaseDatabaseTest, TestGetReferenceWillNullArgument) {