Fix issue #12031685: Sticky Service Breakage in Android 4.4.1

Got a little too aggressive about cleaning up service state; need to
avoid removing services from an app until we are in the second loop
doing the final cleanup, otherwise we can leave services around with
restarting their process.

Change-Id: I526a80285b4ef90c329db7c13442a27b9ad3585f
1 file changed