Merge changes from topic "presubmit-am-2f502d40fb7c4790868f116278a68a44" into sc-qpr1-dev

* changes:
  [automerge] [DO NOT MERGE] wifi: Reset to default SAP configuration when doing factory reset 2p: 197faf1486
  [DO NOT MERGE] wifi: Reset to default SAP configuration when doing factory reset