[automerger skipped] Merge "Clear WIFI namspace on primary user keystore reset." am: 769fc70ba0 am: cf06d11877 -s ours
am skip reason: Merged-In I9364c860250653e50fa8c92c11c510c864f3c3d8 with SHA-1 660f23270e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1723393
Change-Id: If09981bb9b1124142887789d7361d775581e202f
This commit is contained in: