Merge "wifi: match passpoint networks correctly" into sc-dev