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 am: 7204781c am: e104c2d9 am: 67ed7fb0

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



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