Merge "Remove java_api_contribution modules from .bp files" into main am: 6eecd31d am: 29aaf53e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2925995



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