[automerger skipped] [Provider Model] Fix WiFi SSID disappear issue am:...

[automerger skipped] [Provider Model] Fix WiFi SSID disappear issue am: 4ae3bc4e am: 55999ce8 -s ours

am skip reason: Merged-In I505c9b044f8b139fb6c5d4df415c5ad56ce7b301 with SHA-1 22306c37 is already in history

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

Change-Id: I1e045132d47523f0000695e687f1821e5e1fab95