Fix SAM conversions for derived classes

#KT-39535 Fixed
 #KT-37149 Fixed

compiler/testData/diagnostics/tests/j+k/sam/conversionsWithNestedGenerics.kt

@@ -0,0 +1,22 @@
+// FIR_IDENTICAL
+
+// FILE: Listener.java
+public interface Listener<T> {
+    void on(T self);
+}
+
+// FILE: Base.java
+public class Base<S, T extends Listener<S>> {
+    public void addListener(T listener) {}
+}
+
+// FILE: Derived.java
+public class Derived extends Base<Derived, Listener<Derived>> {}
+
+// FILE: test.kt
+
+fun test(w: Derived) {
+    w.addListener { _ -> call() }
+}
+
+fun call() {}