Merge "wifi: Reset to default SAP configuration when doing factory reset" into tm-d1-dev