Merge "Update Spam module to use Dagger"
am: 04e88264e6

Change-Id: I8876723c36630c01b51260ed036df996e029980f