Reland "Add field trial testing config for password and safety check"

This reverts commit 1f9b9db0.

Reason for revert: The test failure was caused by the new button pushing list items off screen.

The fix for this and other related test cases is at: crrev.com/c/2418672

Original change's description:
> Revert "Add field trial testing config for password and safety check"
> 
> This reverts commit 2346288a.
> 
> Reason for revert: Suspected cause of failures of password related tests (testSelectedStoredPasswordIndexIsSameAsInShowPasswordEntryEditingView) on android-marshmallow-x86-rel and others:
> 
> https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-rel/1349
> 
> Original change's description:
> > Add field trial testing config for password and safety check
> > 
> > Make sure that tests which were not meant for Safety Check explicitly
> > disable the feature.
> > 
> > Bug: 1070620, 1092444
> > Change-Id: I83ba782b73cff33f6b4b6f5afa0df9d9e4db2fd6
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410866
> > Auto-Submit: Ioana Pandele <ioanap@chromium.org>
> > Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
> > Reviewed-by: Mark Pearson <mpearson@chromium.org>
> > Commit-Queue: Ioana Pandele <ioanap@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#807803}
> 
> TBR=mpearson@chromium.org,ioanap@chromium.org,chouinard@chromium.org
> 
> Change-Id: Ia51936bc2889d9fc9a8423f8d3c3186358fb045d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1070620
> Bug: 1092444
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416930
> Reviewed-by: Matthew Jones <mdjones@chromium.org>
> Commit-Queue: Matthew Jones <mdjones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807928}

TBR=mpearson@chromium.org,mdjones@chromium.org,ioanap@chromium.org,chouinard@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: 1070620
Bug: 1092444
Change-Id: I8ffe45012305e47bbc36c1972e17e28c54e0c5b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418405Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Commit-Queue: Ioana Pandele <ioanap@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808418}

chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java

@@ -143,9 +143,14 @@ public class MainSettingsFragmentTest {
         Mockito.doReturn(SEARCH_ENGINE_SHORT_NAME).when(mMockSearchEngine).getShortName();
     }
 
+    /**
+     *  TODO(crbug.com/1128924): Add a corresponding test case to support Safety Check being
+     * enabled.
+     */
     @Test
     @LargeTest
     @Feature({"RenderTest"})
+    @DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
     public void testRenderDifferentSignedInStates() throws IOException {
         launchSettingsActivity();
         View view = mSettingsActivityTestRule.getActivity()
@@ -161,9 +166,12 @@ public class MainSettingsFragmentTest {
 
     /**
      * Test for the "Account" section.
+     *
+     * TODO(crbug.com/1128924): Add a corresponding test case to support Safety Check being enabled.
      */
     @Test
     @SmallTest
+    @DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
     public void testStartup() {
         launchSettingsActivity();
 
@@ -207,10 +215,13 @@ public class MainSettingsFragmentTest {
 
     /**
      * Test for the "Account" section.
+     *
+     * TODO(crbug.com/1128924): Add a corresponding test case to support Safety Check being enabled.
      */
     @Test
     @SmallTest
     @Features.EnableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
+    @DisableFeatures({ChromeFeatureList.SAFETY_CHECK_ANDROID})
     public void testStartupWithMobileIdentityConsistency() {
         launchSettingsActivity();
 

testing/variations/fieldtrial_testing_config.json

@@ -6304,6 +6304,22 @@
             ]
         }
     ],
+    "SafetyAndPasswordCheckAndroid": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "PasswordCheck",
+                        "SafetyCheckAndroid"
+                    ]
+                }
+            ]
+        }
+    ],
     "SafetyCheckChromeCleanerChild": [
         {
             "platforms": [