Merge "Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3"" into sc-qpr1-dev am: 1ec12f22c2

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

Change-Id: I2a15ce360aa667ef4a24f7b8657bc950578f489c