WifiNetworkFactory: Consolidate network type matching logic

The changes made to support SAE/OWE transition in ScanResultMatchInfo
for regular saved networks need to be propagated to WifiNetworkFactory.

Bug: 140780736
Test: atest com.android.server.wifi
Change-Id: Ia4e25bd8c7cdaed06a53d9b08588afa67c06f9bc
4 files changed
tree: 1fb9463b48e502e07f9c02fd0b87134debdb24dd
  1. service/
  2. PREUPLOAD.cfg