Auto merge of #32227 - jseyfried:fix_import_resolution_bug, r=alexcrichton

Fix import resolution bug

This fixes #32222, which was introduced in #31726.

diff --cc src/librustc_resolve/resolve_imports.rs
Simple merge