[automerger skipped] Merge "Revert "[DO NOT MERGE] Make sure WiFi and Cell...

[automerger skipped] Merge "Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74db am: 0e2e5971"" into sc-qpr1-dev-plus-aosp am: 42ef4fdf -s ours am: c2f20a70 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibd51fdbe6bd940ed65259b56d4cdc544de1799bb