wifi: merge configurations with relevant security types
As a base type network and a upgradable type network are considered
the same network. i.e. one configuration for both of them, this change will
merge an upgradable type to the base type or
a base type to an upgradable type if SSID is matched:
* Assume a SAE config is added and there is already a PSK/SAE config,
it will update the PSK/SAE config and set add-by-auto-upgrade to false,
but not create another SAE config.
* Assume a PSK config is added and there is already a SAE config,
it will create a PSK/SAE config with add-by-auto-upgrade is false to
replace the original SAE config.
Bug: 162685856
Test: atest FrameworksWifiTests
Change-Id: Ib469a625ef0416faca64f0e554774d8c751bda76
4 files changed