am ba7ee88c: am acf761eb: am fd62bcfd: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev

* commit 'ba7ee88cb78aee12e923a531f513d6d90965db7a':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.

core/java/android/net/ConnectivityManager.java

@@ -2110,6 +2110,8 @@ public class ConnectivityManager {
          * can automatically log in to a captive portal without user intervention.
          *
          * @param network The {@link Network} of the network that is being evaluated.
+         *
+         * @hide
          */
         public void onPreCheck(Network network) {}
 

core/java/android/net/NetworkCapabilities.java

@@ -173,7 +173,6 @@ public final class NetworkCapabilities implements Parcelable {
      * Indicates that connectivity on this network was successfully validated. For example, for a
      * network with NET_CAPABILITY_INTERNET, it means that Internet connectivity was successfully
      * detected.
-     * @hide
      */
     public static final int NET_CAPABILITY_VALIDATED      = 16;