Merge "Make overrides work in Soong" into main am: b11c99d0

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



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