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

Change-Id: Ia96da46def754c3a8fcc909d3e3823db2ce77c3b