Don't mark Services and Activities as @Singleton

Android gets to choose when to create services. If Dagger
has them marked as @Singleton, then it hangs onto the
references forever, and this causes problems.

Bug: 143895143
Test: manual
Change-Id: Iee61fc8d6f70e01af167cc215ae7dcde235687af