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

* changes:
  [automerge] Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset"" 2p: dbdb6bad10
  Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""