[automerger skipped] Merge "Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""" into tm-dev am: 8c9f672d19 am: ffb46717e4 -s ours

am skip reason: Merged-In Ifc12240165e7108210b8a5f630eb737a185acad2 with SHA-1 bca528dcd7 is already in history

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

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