[automerger skipped] Merge "Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""" into rvc-dev am: 1f8524b9ba am: f1025bce44 -s ours am: 1dbac17a54 -s ours am: a1673f6bb4 -s ours

am skip reason: subject contains skip directive

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

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