Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed."...

Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e am: a2c259c1 am: 1554515d am: 052ed123

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



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