Merge "AppWidgetManager shouldn't use StorageManager."