[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: cf1871690f -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: Ifdb758a41cda85a821a8280f976ca5d40606c8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>