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 am: 831ee2b7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iba4f3b38951101461e6a514f05894f80ff2cb530