Merge changes I80bebcd0,I35f3718f into qt-dev

* changes:
  Simplification of code to prevent a Log.wtf in expected cases.
  Suppress the wtf log for notifications that are expected

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

@@ -232,6 +232,11 @@ public class NetworkNotificationManager {
             title = r.getString(R.string.network_switch_metered, toTransport);
             details = r.getString(R.string.network_switch_metered_detail, toTransport,
                     fromTransport);
+        } else if (notifyType == NotificationType.NO_INTERNET
+                    || notifyType == NotificationType.PARTIAL_CONNECTIVITY) {
+            // NO_INTERNET and PARTIAL_CONNECTIVITY notification for non-WiFi networks
+            // are sent, but they are not implemented yet.
+            return;
         } else {
             Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport "
                     + getTransportName(transportType));