Merge "Remove ConvertWithBp2build implementations" into main am: a72573a7 am: cd4b2f21

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



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