[K2] Revert changes done in KT-61786

Changes in this ticket remove type enhancement in java fields
for K2. But after KT-61920 fix, we can actually support it.

compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.fir.diag.txt

@@ -1 +1 @@
-/test.kt:(154,158): error: Overload resolution ambiguity between candidates: [static field SOME: String!, static enum entry SOME: SomeEnum]
+/test.kt:(154,158): error: Overload resolution ambiguity between candidates: [static field SOME: String, static enum entry SOME: SomeEnum]

compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.fir.diag.txt

@@ -1 +1 @@
-/test.kt:(160,164): error: Overload resolution ambiguity between candidates: [static field SOME: String!, static enum entry SOME: SomeEnum]
+/test.kt:(160,164): error: Overload resolution ambiguity between candidates: [static field SOME: String, static enum entry SOME: SomeEnum]

compiler/testData/diagnostics/tests/modifiers/const/kotlinJavaCycle.fir.kt

@@ -0,0 +1,21 @@
+// IGNORE_REVERSED_RESOLVE
+// IGNORE_CONTRACT_VIOLATIONS
+// FILE: Bar.java
+
+public class Bar {
+    public static final int BAR = Foo.FOO + 1;
+}
+
+// FILE: Test.kt
+
+class Foo {
+    companion object {
+        const val FOO = Baz.BAZ + 1
+    }
+}
+
+class Baz {
+    companion object {
+        const val BAZ = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>Bar.BAR + 1<!>
+    }
+}

compiler/testData/diagnostics/tests/modifiers/const/kt12248.kt

@@ -1,3 +1,5 @@
+// IGNORE_REVERSED_RESOLVE
+// IGNORE_CONTRACT_VIOLATIONS
 // FIR_IDENTICAL
 // FILE: Bar.java
 

compiler/testData/diagnostics/tests/visibility/packagePrivateStaticInterfaceFieldViaKotlinClass.fir.txt

@@ -14,8 +14,8 @@ FILE: Child.kt
         }
 
         public final fun foo(): R|kotlin/Unit| {
-            lval x: R|kotlin/String!| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
-            lval y: R|kotlin/String!| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
+            lval x: R|kotlin/String| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
+            lval y: R|kotlin/String| = Q|javapackage/PublicParentClass|.R|javapackage/PackagePrivateGrandparentInterface.publicStaticField*s|
             lval z: <ERROR TYPE REF: Unresolved name: publicStaticField> = Q|javapackage/KotlinParentClass|.<Unresolved name: publicStaticField>#
         }