Merge "Add media-provider-platform-compat-config to system image"