Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  wifi: Reset to default SAP configuration when doing factory reset

Change-Id: I1c1cc313c4df1ddbf9f245e864344157d6ee19b6