Add 5G detection to android_network_monitor

This patch adds detection of 5G to andoird_network_monitor
using the TelephonyManager.NETWORK_TYPE_NR.

It also adds
- TelephonyManager.NETWORK_TYPE_GSM as 2G
- TelephonyManager.NETWORK_TYPE_TD_SCDMA as 3G
- TelephonyManager.NETWORK_TYPE_IWLAN as 4G

note: AdapterTypeFromNetworkType still return rtc::ADAPTER_TYPE_CELLULAR
for all cellular connections (changing that is a next step).

Bug: webrtc:11473
Change-Id: If2e681e10b24f46ea0071db0cdba758a8c4e7ee2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174500
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31171}

sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java

@@ -50,6 +50,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
     CONNECTION_UNKNOWN,
     CONNECTION_ETHERNET,
     CONNECTION_WIFI,
+    CONNECTION_5G,
     CONNECTION_4G,
     CONNECTION_3G,
     CONNECTION_2G,
@@ -798,6 +799,7 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
           case TelephonyManager.NETWORK_TYPE_CDMA:
           case TelephonyManager.NETWORK_TYPE_1xRTT:
           case TelephonyManager.NETWORK_TYPE_IDEN:
+          case TelephonyManager.NETWORK_TYPE_GSM:
             return ConnectionType.CONNECTION_2G;
           case TelephonyManager.NETWORK_TYPE_UMTS:
           case TelephonyManager.NETWORK_TYPE_EVDO_0:
@@ -808,9 +810,13 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
           case TelephonyManager.NETWORK_TYPE_EVDO_B:
           case TelephonyManager.NETWORK_TYPE_EHRPD:
           case TelephonyManager.NETWORK_TYPE_HSPAP:
+          case TelephonyManager.NETWORK_TYPE_TD_SCDMA:
             return ConnectionType.CONNECTION_3G;
           case TelephonyManager.NETWORK_TYPE_LTE:
+          case TelephonyManager.NETWORK_TYPE_IWLAN:
             return ConnectionType.CONNECTION_4G;
+          case TelephonyManager.NETWORK_TYPE_NR:
+            return ConnectionType.CONNECTION_5G;
           default:
             return ConnectionType.CONNECTION_UNKNOWN_CELLULAR;
         }

sdk/android/src/jni/android_network_monitor.cc

@@ -48,6 +48,9 @@ static NetworkType GetNetworkTypeFromJava(
   if (enum_name == "CONNECTION_WIFI") {
     return NetworkType::NETWORK_WIFI;
   }
+  if (enum_name == "CONNECTION_5G") {
+    return NetworkType::NETWORK_5G;
+  }
   if (enum_name == "CONNECTION_4G") {
     return NetworkType::NETWORK_4G;
   }
@@ -81,6 +84,7 @@ static rtc::AdapterType AdapterTypeFromNetworkType(NetworkType network_type) {
       return rtc::ADAPTER_TYPE_ETHERNET;
     case NETWORK_WIFI:
       return rtc::ADAPTER_TYPE_WIFI;
+    case NETWORK_5G:
     case NETWORK_4G:
     case NETWORK_3G:
     case NETWORK_2G:

sdk/android/src/jni/android_network_monitor.h

@@ -31,6 +31,7 @@ enum NetworkType {
   NETWORK_UNKNOWN,
   NETWORK_ETHERNET,
   NETWORK_WIFI,
+  NETWORK_5G,
   NETWORK_4G,
   NETWORK_3G,
   NETWORK_2G,