Merge "Cleaned up deps in SpamBlockingPromoHelperTest."