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 am: 9c4a5e69 am: 7d54ecce

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



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