Merge "Change java_test_host to support cov variant." into main am: 0bf0865f...

Merge "Change java_test_host to support cov variant." into main am: 0bf0865f am: 8a5b48e2 am: b17766ab

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



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