Merge "Keep build/bazel/ci/dist/BUILD for bp2build." am: 632d0a03ed am: 7eed46b65b

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

Change-Id: Ifa4efd66a0637a04966f0a689ee8a0b2081b444c