Merge "[NetworkSuggestion] Allow app to set subId for the suggestion"