Merge "bp2build allowlist expanded" am: f8365526 am: 5b3acb0e am: 8838cb76

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



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