Merge "mediaserver: grant perms from domain_deprecated"