[automerger skipped] Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev am: fd48e9f7e5 am: 0a7e1b0070 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6396e7262a545d4eb6987c49fb9c921330ef056d