Merge "Decouple the target build variant from the platform" into main am:...

Merge "Decouple the target build variant from the platform" into main am: 747ecf4b am: df432bae am: 75e0bbda am: 9ebc3db2 am: abd4e112

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



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