Merge "Revert "Do not convert non-unit tests."" into main am: 6525ee82 am:...

Merge "Revert "Do not convert non-unit tests."" into main am: 6525ee82 am: d666762c am: c32bc719

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



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