[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-dev am: fd48e9f7 am: c33250a2 am: 5f9bbae5 -s ours am: cedf11c1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f3fc9ea5ea01ea03c5fad4008280d4d4a69f50e