IDEA-115838 FQN inserted for annotated code instead of using imports

java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java

@@ -345,6 +345,7 @@ public class PsiImplUtil {
         if (annotationType instanceof PsiClass) {
           return findApplicableTarget((PsiClass)annotationType, types);
         }
+        if (annotationType == null) return null;
       }
     }
 

java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy

@@ -166,6 +166,22 @@ class Test {
     @TA
     Collection<caret> c;
 }
+'''
+  } 
+
+  public void testUnresolvedAnnotatedQualifiedImport() {
+    myFixture.configureByText 'a.java', '''
+class Test {
+    @Nullable Collection<caret> c;
+}
+'''
+    importClass();
+    myFixture.checkResult '''import java.util.Collection;
+
+class Test {
+    @Nullable
+    Collection<caret> c;
+}
 '''
   }