[automerger skipped] Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are...

[automerger skipped] Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-qpr1-dev am: 9a60071e am: c0f4724f -s ours am: 98fc0214 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I23a3985967c0ec47920042463fc2e6c54ea8a6e9