Merge "Override modules should always override source modules" into main am: 2f9af237

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



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