Merge "java_api_contribution module definitions for Media" am: e9087aac98

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2359922

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