Merge "NetworkSuggestionEvaluator: Minor Refactor for onConnectable"