Merge "[NetworkSuggestion] allow apps in-place modify suggestion"