Merge "WifiConnectivityManager: add error log if neither OEM_PAID/PRIVATE are set"