Merge "java_api_contribution module definition for MediaProvider"