Merge change 8301

* changes:
  update the permissions for the AccountManagerService