This reverts commit 302f6cf17f.
Reason for revert:
As explained in https://buganizer.corp.google.com/issues/185431894#comment22, the WiFi network and the VPN over that WiFi network are considered different networks, which will cause the WiFi network update to be ignored by the SysUI
Bug: 185431894
Test: unit tests
Change-Id: I715960ba925be9cd469065c1220b879b4cca882b