[automerger skipped] [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74dbc3 am: b4fcb5842b -s ours am: d6ce3e841c -s ours am: 37fb489f48 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I816170916081028a08e9f1622f09691837e0154d