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

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

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

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