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 am: 01ae272f am: 25ab39bc am: 1778fa56

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



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