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

[automerger skipped] Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74db" am: 493a11ea am: d20eac56 -s ours am: 69bc6e04 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idf2a65a61b17459a0a8947cb3a18cd6a21e8ae7e