Merge "[DO NOT MERGE] wifi: Reset to default SAP configuration when doing factory reset" into sc-dev