Merge "mediaserver: grant perms from domain_deprecated"
am: 3d8391e759

* commit '3d8391e759fd3ffe70f10fc77e252fe71c902836':
  mediaserver: grant perms from domain_deprecated