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

Change-Id: Id59e0e87825e9edba1fdfb858fd7ef77dd1fd91d