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

am skip reason: Merged-In Ia57b4d91320f8e61e94d9ffd47e06648dfc24f3f with SHA-1 38bf41b7 is already in history

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

Change-Id: Ieace1710cadd4f56486f2455c3ba5be3d11b221a