Merge "Remove bionic bp2build properties" into main am: 0ce2dcfad2 am: 02d1df862b

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2863360

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