Merge changes Id22d473b,I78fff001

* changes:
  NetworkSuggestionEvaluator: Don't connect to user deleted networks
  WifiServiceImpl: Fix usage of isPrivileged in disableEphemeralNetwork