Merge changes from topic "ns05" into sc-dev

* changes:
  [NS06] Implement the don't-reap mechanism
  [NS05] Feed network offer callbacks

framework/src/android/net/ConnectivityManager.java

@@ -3345,7 +3345,7 @@ public class ConnectivityManager {
      * @param score The prospective score of the network.
      * @param caps The prospective capabilities of the network.
      * @param callback The callback to call when this offer is needed or unneeded.
-     * @hide
+     * @hide exposed via the NetworkProvider class.
      */
     @RequiresPermission(anyOf = {
             NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
@@ -3368,7 +3368,7 @@ public class ConnectivityManager {
      *
      * @param callback The callback passed at registration time. This must be the same object
      *                 that was passed to {@link #offerNetwork}
-     * @hide
+     * @hide exposed via the NetworkProvider class.
      */
     public void unofferNetwork(@NonNull final INetworkOfferCallback callback) {
         try {