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

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



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