Merge "Do not convert non-unit tests." into main am: 596ee5c8 am: bf659c7d...

Merge "Do not convert non-unit tests." into main am: 596ee5c8 am: bf659c7d am: 0b7fbfdc am: f2cc7f91 am: 2a092316

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



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