[automerger skipped] Merge "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset"" into sc-dev am: 68aa5d6e5a -s ours

am skip reason: Merged-In I0334064347080e43096d01f00cf516804812d0c0 with SHA-1 7d1c5d8eb2 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/19693251

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/21302723

Change-Id: Iae0f2dd19d89b335101c938a4a54ca1684ba707e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>