Merge "Revert "Make the android.process.media a persistent process""