[automerger skipped] Merge "[Provider Model] Fix WiFi reconfiguration issue" into tm-dev am: 4ff1762d -s ours

am skip reason: Merged-In Ia57b4d91320f8e61e94d9ffd47e06648dfc24f3f with SHA-1 2d17fc8d is already in history

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

Change-Id: I5c3e2fbab73a20e46079cfff335066ee29d61fdc