[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 skip reason: subject contains skip directive

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

Change-Id: If8073e33a29da22d9262ce888cd40b2b9b8759e2