Merge "Do not deduce VCN capability if Builder is derived from request" am: 4f6c13a4c2 am: 22edbef1ca am: 807284da27

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

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178

packages/Connectivity/framework/src/android/net/NetworkRequest.java

@@ -220,6 +220,10 @@ public class NetworkRequest implements Parcelable {
         public Builder(@NonNull final NetworkRequest request) {
             Objects.requireNonNull(request);
             mNetworkCapabilities = request.networkCapabilities;
+            // If the caller constructed the builder from a request, it means the user
+            // might explicitly want the capabilities from the request. Thus, the NOT_VCN_MANAGED
+            // capabilities should not be touched later.
+            mModifiedNotVcnManaged = true;
         }
 
         /**