Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  wifi: Reset to default SAP configuration when doing factory reset

Change-Id: I0861761cf147e2e8890645d1ac3510621f011be3