Merge "Don't use DirectlyInAnyApex to enable dex and coverage" into main am:...

Merge "Don't use DirectlyInAnyApex to enable dex and coverage" into main am: e99f07ce am: 5d93123d

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



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