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

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

Change-Id: I652d1eb396552cdbe0c26ee7f9267e022867a7b3