Merge "wifi: always return non-null value from generateSecurityParamsListFromScanResult" into sc-dev