Merge "Use correct module name for java_import in shouldConvertWithBp2build...

Merge "Use correct module name for java_import in shouldConvertWithBp2build verification" into main am: 57e60bf8 am: 2bb12a54

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777928



Change-Id: I119e3341f4665d9ba986be2b004f865e4168c0d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>