Merge "Cleaned up deps in SpamBlockingPromoHelperTest."
am: edb47e1b62

Change-Id: I9d2f7ff96ce5b03ed45cd8afc46b67bbbb5acf11