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

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



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