[automerger skipped] Merge "Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""" into sc-dev am: 24b9caf9ff am: d8abdba32b -s ours am: 4ee394a1f8 -s ours am: b143b496d8 -s ours

am skip reason: subject contains skip directive

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

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