Merge "Allow Ravenwood to cross variant boundaries" into main am: 3a35d649

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



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