Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo