Merge "wifi: convert legacy security fields to security params on restoing from store" into sc-dev