Merge "Don't allow acccess to uninstalled system providers" into pi-dev
am: bf47ae3152

Change-Id: I559684b93914020702636ee21ff0f79138740a77