Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250 am: 201429b683

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0118ce1ed80dd4b672e98f8a7a905d42462f24f

src/com/android/settings/development/AdbIpAddressPreferenceController.java

@@ -126,7 +126,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer
      * @return the formatted and newline-separated IP addresses, or null if none.
      */
     private static String getDefaultIpAddresses(ConnectivityManager cm) {
-        LinkProperties prop = cm.getActiveLinkProperties();
+        LinkProperties prop = cm.getLinkProperties(cm.getActiveNetwork());
         return formatIpAddresses(prop);
     }