Merge "Revert "Revert "Move PermissionsState into PermissionManagerService."""