[automerger skipped] Merge "Allow Ravenwood to cross variant boundaries" into...

[automerger skipped] Merge "Allow Ravenwood to cross variant boundaries" into main am: 3a35d649 am: 18e3e0d5 am: f420f19e -s ours

am skip reason: Merged-In Ia395d32bad57007ec477a6410dcc4201853c8790 with SHA-1 190b1aac is already in history

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



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