[automerger skipped] 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 am: 72e503e395 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6654bd34725a54baf4f0a3a940569f557922c862