Fix ContentProvider removal bug

Also update testing to exercise the full ContentProvider stop flow.

Flag: EXEMPTED_bugfix
Fixes: 372360536
Test: atest MockingOomAdjusterTests
Change-Id: I63a70af0a1ba7640a4c6f5ffa421a41b9bfcfc85
3 files changed