Merge "WifiService: setWifiEnabled bypass for older apps"