[automerger skipped] Merge "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset"" into rvc-qpr-dev am: 8520b8203d -s ours am: debdbc6d95 -s ours am: 1ec28c9719 -s ours am: 361be812db -s ours am: 07934d1153 -s ours am: 1133078bab -s ours

am skip reason: subject contains skip directive

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

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