Fix bug in provider removal

We shouldn't mark the provider as stopped until all actions required to
stop the provider are complete.

Bug: 170688034
Test: manual
Change-Id: If810dc166d3b78974370390c15dfc9c6ebdb1098
2 files changed