Merge "Revert "Remove (I)MediaDrmService""