Merge "Revert "Revert "Don't include linux_bionic variants to platform-..."" into main am: 1189eed0c7

Original change: https://android-review.googlesource.com/c/platform/development/+/3069327

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