Merge "Revert "Move PermissionsState into PermissionManagerService.""