Merge "wifi: Merge oem paid & oem private network factories" into sc-dev