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

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



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