Merge "Use RouteInfo API constructor in VpnService" am: 6b501d8acf am: ec10603f92

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a5acb985f2f6514af6ff06290dafeb32de9d35b

core/java/android/net/VpnService.java

@@ -596,7 +596,8 @@ public class VpnService extends Service {
                     }
                 }
             }
-            mRoutes.add(new RouteInfo(new IpPrefix(address, prefixLength), null));
+            mRoutes.add(new RouteInfo(new IpPrefix(address, prefixLength), null, null,
+                RouteInfo.RTN_UNICAST));
             mConfig.updateAllowedFamilies(address);
             return this;
         }