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

* dev/10/fp2/security-aosp-qt-release:
  wifi: remove certificates for network factory reset

Change-Id: If92d8deb7e73e11cbbcc4d090685f31ab02fb1e6