Merge "Remove java_api_contribution modules from .bp files" into main am: 70793e919c

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2927230

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