Merge "Revert "Split mediaprovider from priv_app."" into oc-dr1-dev
am: 6aa9869a41

Change-Id: I5ee6145cfa3c6701450f2984eacdde41ccd505ec