[sheriff] disable...

[sheriff] disable GoogleServicesSettingsTestCase.testActivityAndInteractionsDisabledWithHistoryDisabled on all devices/simulators.

The test is only disabled on devices for now, and this CL disables it on
both devices and simulators.

TBR=edchin@chromium.org

Change-Id: I7aabcbd1fbfe9017907db950097a9e3e002efa68
Reviewed-on: https://chromium-review.googlesource.com/c/1345009Reviewed-by: Yi Su <mrsuyi@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609786}

ios/chrome/browser/ui/settings/google_services_settings_egtest.mm

@@ -147,10 +147,8 @@ using unified_consent::prefs::kUnifiedConsentGiven;
 // Tests that "Activity and Interactions" switch should be disabled when the
 // "History" sync is off.
 - (void)testActivityAndInteractionsDisabledWithHistoryDisabled {
-// TODO(crbug.com/906680): Re-enable this test when it's fixed.
-#if TARGET_IPHONE_SIMULATOR
+  // TODO(crbug.com/906680): Re-enable this test when it's fixed.
   EARL_GREY_TEST_DISABLED(@"Test disabled on simulators.");
-#endif
 
   [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
   [self resetUnifiedConsent];