wifi: match passpoint networks correctly

Passpoint security type should be added to passpoint networks, or
they cannot be matched against passpoint configurations.

Passpoint R1/R2 does not ask for PMF requirement, a Passpoint R3
network, which enforces PMF, is also a valid Passpoint R1/R2 network.

As a result, for passpoint networks, they are either R1/R2 + R3 network,
or R1/R2-only network.

Bug: 179007438
Test: atest FrameworksWifiTest
Change-Id: I10ddf92a77bd2b1227f071b3cfcde25175c80506
6 files changed