[automerger skipped] Merge "Revert "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset""" into sc-qpr1-dev am: 74581cce73 -s ours am: 549a8ce9ac -s ours am: 17057dc181 -s ours

am skip reason: subject contains skip directive

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

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