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

am skip reason: Merged-In I0334064347080e43096d01f00cf516804812d0c0 with SHA-1 a4c11a58b5 is already in history. Merged-In was found from reverted change.

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

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