Merge "Avoid NPE when missing underlyingCaps."

am: 6522970c1e

Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519

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

@@ -305,6 +305,7 @@ public class Vpn {
         } else {
             for (Network underlying : underlyingNetworks) {
                 final NetworkCapabilities underlyingCaps = cm.getNetworkCapabilities(underlying);
+                if (underlyingCaps == null) continue;
                 for (int underlyingType : underlyingCaps.getTransportTypes()) {
                     transportTypes = ArrayUtils.appendInt(transportTypes, underlyingType);
                 }