[Android] Re-enable test in GoogleServicesSettings

In https://crrev.com/c/2498946 the following test was disabled because
it was flaky on emulator:
- GoogleServicesSettingsTest#showSignOutDialogBeforeSigningUserOut

They are re-enabled on other builders.

This issue seems to be problem with espresso being used in emulators
similar to this bug: https://crrev.com/c/1108459

Bug: 1142481
Change-Id: I28fff49d24244af7935729e895fc2f78659ef716
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2499541Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821272}

chrome/android/javatests/src/org/chromium/chrome/browser/sync/GoogleServicesSettingsTest.java

@@ -20,7 +20,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.DisableIf;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -100,7 +100,7 @@ public class GoogleServicesSettingsTest {
     @Test
     @LargeTest
     @Features.EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
-    @DisabledTest(message = "https://crbug.com/1142481")
+    @DisableIf.Build(supported_abis_includes = "x86", message = "https://crbug.com/1142481")
     public void showSignOutDialogBeforeSigningUserOut() {
         mAccountManagerTestRule.addTestAccountThenSigninAndEnableSync();
         startGoogleServicesSettings();