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

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/21310543

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