Merge "Create an apex_contributions module type" into main am: 29f5f257 am:...

Merge "Create an apex_contributions module type" into main am: 29f5f257 am: c3e8223c am: afa46685

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



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