Merge "Generate java_api_contribution module from droidstubs module" am: b6690d21

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



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