Merge "WifiManager: setWifiEnabled bypass for older apps"