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

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

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



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