am 4fa63b43: am 358d12a0: Merge "Fix lost singleton provider after...
am 4fa63b43: am 358d12a0: Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev
* commit '4fa63b43':
Fix lost singleton provider after force-stopping user or package.