Disable flaky ShouldKeepLocalDataOnTypeMismatch_E2ETest.

This TwoClientPreferencesSyncTestWithSelfNotifications test case is
flaky.

TBR=mastiz@chromium.org

Bug: 1012688
Change-Id: I33f1956523be55f3f77db0560aac4c3de6721341
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1859635Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705625}

chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

@@ -222,8 +222,10 @@ class TwoClientPreferencesSyncTestWithSelfNotifications : public SyncTest {
   DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTestWithSelfNotifications);
 };
 
+// Flaky. https://crbug.com/1012688
+// This was E2E_ENABLED(ShouldKeepLocalDataOnTypeMismatch).
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTestWithSelfNotifications,
-                       E2E_ENABLED(ShouldKeepLocalDataOnTypeMismatch)) {
+                       DISABLED_ShouldKeepLocalDataOnTypeMismatch) {
   ResetSyncForPrimaryAccount();
   // Client 1 has type-conflicting data in it's pref file. Verify that incoming
   // values from sync of other type do not modify the local state.