am 4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev

* commit '4b545dfbcd6ed724d5fc01b7ba21506db99e881b':
  Add a hidden method to clear the capabilities of a NetworkRequest

core/java/android/net/NetworkRequest.java

@@ -114,6 +114,18 @@ public class NetworkRequest implements Parcelable {
             return this;
         }
 
+        /**
+         * Completely clears all the {@code NetworkCapabilities} from this builder instance,
+         * removing even the capabilities that are set by default when the object is constructed.
+         *
+         * @return The builder to facilitate chaining.
+         * @hide
+         */
+        public Builder clearCapabilities() {
+            mNetworkCapabilities.clearAll();
+            return this;
+        }
+
         /**
          * Adds the given transport requirement to this builder.  These represent
          * the set of allowed transports for the request.  Only networks using one