[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 -s ours am: fd1133c0 -s ours am: 1d847ec1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id4ff48ca324d82d4dc8ec2b821f1fe46d88e2c4f