Merge "Remove AppWidgetManagerInternal instance before adding to global registry of LocalServices"