Merge change I0d8f7593 into eclair

* changes:
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op