Merge "Revert "Split mediaprovider from priv_app."" into oc-dr1-dev