Merge "Rename WifiManager.ACTION_WIFI_SCAN_AVAILABLE"