Merge "Revert "Cache the UserInfo for the system user on UserManagerService.""