Merge "Mixed builds is supported for all apex module types, not just "apex"."...

Merge "Mixed builds is supported for all apex module types, not just "apex"." am: 78d15f2b am: e48ee45e

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



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