am c4f76b32: am 4857c1d8: (-s ours) Merge "Fix lost singleton provider after...
am c4f76b32: am 4857c1d8: (-s ours) Merge "Fix lost singleton provider after force-stopping user or package."
* commit 'c4f76b32':
Fix lost singleton provider after force-stopping user or package.