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

* commit '15decd6955093683a9d78cc2983d7ea49f20bba2':
  mediaserver: grant perms from domain_deprecated