Merge "Small change to AppWidgetProviderInfo  public field name and docs"