Merge "Exclude disabled modules in test_package" into main am: f19bde5e am: 2d44d62a

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



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