Merge "Fix bug 2362761 AppWidgetService should use Intent.setPackage()"