[automerger skipped] Merge "Clear WIFI namspace on primary user keystore...

[automerger skipped] Merge "Clear WIFI namspace on primary user keystore reset." am: 769fc70b am: cf06d118 -s ours am: 0c4a868d -s ours

am skip reason: Merged-In I9364c860250653e50fa8c92c11c510c864f3c3d8 with SHA-1 660f2327 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1723393

Change-Id: If47733d391a4fb7147d1d85592c7ea4b0522a224