[automerger skipped] Merge "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset"" into rvc-dev am: 51bf4de230 -s ours am: 89667ee5b1 -s ours am: 63e118bca5 -s ours am: ae9dc5d67c -s ours am: 173fb2e2b1 -s ours am: d5e7ec85e0 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/21300837

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