Merge "[automerger skipped] Merge "[DO NOT MERGE] Make sure WiFi and Cell...

Merge "[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 -s ours" into sc-v2-dev am: 72e973fe

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

Change-Id: I92974109da04c0aff45e82214cd1b06ad1c00a38