Merge "Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""" into sc-dev am: 24b9caf9ff

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

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