Revert "[6.0.0] Default --incompatible_strict_conflict_checks to true. (bazelbuild#16864)" (bazelbuild#16872)

This reverts commit fe16965.

Breaks rules_apple (and possibily other projects).

Author: tjgq

src/main/java/com/google/devtools/build/lib/analysis/AnalysisOptions.java

@@ -91,9 +91,8 @@ public class AnalysisOptions extends OptionsBase {
   public boolean skyframePrepareAnalysis;
 
   @Option(
-      name = "incompatible_strict_conflict_checks",
-      oldName = "experimental_strict_conflict_checks",
-      defaultValue = "true",
+      name = "experimental_strict_conflict_checks",
+      defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       metadataTags = OptionMetadataTag.INCOMPATIBLE_CHANGE,
       effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION},

src/test/java/com/google/devtools/build/lib/remote/BuildWithoutTheBytesIntegrationTest.java

@@ -312,8 +312,6 @@ public void symlinkToDirectory() throws Exception {
 
   @Test
   public void symlinkToNestedFile() throws Exception {
-    addOptions("--noincompatible_strict_conflict_checks");
-
     write(
         "a/defs.bzl",
         "def _impl(ctx):",
@@ -366,8 +364,6 @@ public void symlinkToNestedFile() throws Exception {
 
   @Test
   public void symlinkToNestedDirectory() throws Exception {
-    addOptions("--noincompatible_strict_conflict_checks");
-
     write(
         "a/defs.bzl",
         "def _impl(ctx):",