am baf8ef51: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'baf8ef51713b8ab960d46c8d888b7dd3cf1a74d4':
  Revert "Accept and pass URLs to PackageManagerService"