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

am skip reason: subject contains skip directive

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

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