Merge "Remove AppWidgetManagerInternal instance before adding to global...
Merge "Remove AppWidgetManagerInternal instance before adding to global registry of LocalServices" am: d92149a7 am: 2adbc88c
Change-Id: I4f529c067e7ba577874c15f5910f5d085cd97e8a