Merge "Correct global excludes not always being excluded" am: 0725a60e am:...

Merge "Correct global excludes not always being excluded" am: 0725a60e am: 8febc25e am: 8efe77f3

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



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