Merge "Fix NPE in AppWidgetService.addProvidersForPackageLocked()"