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

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

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