It looks like we could add services to the restart list because they end up left in the process's list of running services after they have been removed from the main activity list, and we can trip up on them there when the app is being force stopped. Change-Id: I79805b67fcf5b593430dc5c856c97927e1a54a57