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

* commit '1cf93217fa578b3439b37b7f5a3b5045a97ec5d4':
  vold: grant perms from domain_deprecated