Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in...

Revert "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model am: bc6f74db am: 0e2e5971"

This reverts commit 6c57da52.

Reason for revert: Breaking the build

Change-Id: I028b5a3b630a8ab4d798a458f0215b477acdb7dc