Merge "WifiManager: add WIFI_MODE_NO_LOCKS_HELD"