[automerger skipped] [DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: 8bb51489 am: 9fff3919 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibaa2188b1f198f6ce15e1b17b3fb6cf524897853