[automerger skipped] Merge "Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""" into sc-v2-dev am: e4a7cdae96 -s ours am: 61acab0300 -s ours am: a8134b0c99 -s ours am: 318b832496 -s ours

am skip reason: subject contains skip directive

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

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