[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: 462291a5 am: cd99acd4 -s ours am: 6c65afba -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id116884ea4bda5b020d366e421f7fde260409023