Merge "Add soong config variable for test packages conversion" into main am:...

Merge "Add soong config variable for test packages conversion" into main am: c1a2a238 am: 89f48b49

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



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