Merge "vold: grant perms from domain_deprecated" am: 1cf93217fa
am: 9001f6f892

* commit '9001f6f892a8a9eb73dd27c040ab6398ec238fe5':
  vold: grant perms from domain_deprecated