Fix ChangeType inner class import handling when outer class import is present#7032

MBoegers wants to merge 2 commits intomainopenrewrite/rewrite:mainfrom

fix/change-type-inner-class-importopenrewrite/rewrite:fix/change-type-inner-class-importCopy head branch name to clipboard