Merge changes I6260695b,I88f00ca4

am: db9335b832

Change-Id: I550cb7e14d6c9f21a3d87073bcf692e387857cba

core/java/android/net/NetworkRequest.java

@@ -247,9 +247,8 @@ public class NetworkRequest implements Parcelable {
          * removing even the capabilities that are set by default when the object is constructed.
          *
          * @return The builder to facilitate chaining.
-         * @hide
          */
-        @UnsupportedAppUsage
+        @NonNull
         public Builder clearCapabilities() {
             mNetworkCapabilities.clearAll();
             return this;