[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"" into sc-qpr1-dev am: 1ec12f22 -s ours am: 5e7964c9 -s ours am: 5889f2a9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I37ea8714b3501c7052b457798c47609a75847fea