[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 am: 72e503e3 -s ours am: 6b6ede25 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4befddf9c1eef197699a9c416995ce3224df2d46