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

am skip reason: subject contains skip directive

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

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