[automerger skipped] Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-v2-dev am: 2c71adce am: 64eac090 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id7872dd6fe55756d3a0be918736172c02349963d