Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main...

Merge "Revert^2 "bp2build converter for android_test_helper_app."" into main am: a56002a4 am: f7566167

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



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