Merge "Revert "Fix coverage when transitive jars are enabled"" into main am:...

Merge "Revert "Fix coverage when transitive jars are enabled"" into main am: 6b06a3a3 am: 847df4b8

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



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