[FIR] Resolve ambiguities in Java static scopes

compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.fir.kt

@@ -13,4 +13,4 @@ public class Bbb extends Aaa {
 
 // FILE: b.kt
 
-fun foo() = Bbb.<!AMBIGUITY!>i<!>
+fun foo() = Bbb.i

compiler/testData/diagnostics/tests/j+k/shadowingPrimitiveStaticField.fir.kt

@@ -4,9 +4,9 @@ import aa.B
 
 fun use() {
     // checking that CONST is of platform type
-    B.<!AMBIGUITY!>CONST<!> = null
-    B.<!AMBIGUITY!>CONST<!>?.<!UNRESOLVED_REFERENCE!>length<!>
-    B.<!AMBIGUITY!>CONST<!>.<!UNRESOLVED_REFERENCE!>length<!>
+    B.CONST = null
+    B.CONST?.length
+    B.CONST.length
 }
 
 // FILE: aa/A.java