Revert^2 "WifiService: Use WifiInfo for masking"

16bec8408134f523d2d53b8924be6d67a44ab37a

Bug: 162602799
Bug: 177390648
Test: atest com.android.systemui.statusbar.policy.NetworkControllerWifiTest
Change-Id: I7fff17d40de2c76137e2ad10b33bdc3b08f66534
2 files changed