Merge "Call ResolveExcludes after arch-based sources computation in java.go" am: 8062140a16 am: 81771ec3d5

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

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