WifiInfo: API changes to conform with connectivity API changes

Bug: 156867433
Bug: 162602799
Test: Compiles

Change-Id: I7079161e2692774be93463ebb7f7af82b60b1bb9
Merged-In: I89d1685c5159f38fa4245b7291456e9d594cb808
diff --git a/framework/api/current.txt b/framework/api/current.txt
index 9e2bf94..28224cf 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -284,7 +284,6 @@
     method public android.net.wifi.SupplicantState getSupplicantState();
     method @IntRange(from=0xffffffff) public int getTxLinkSpeedMbps();
     method public int getWifiStandard();
-    method @NonNull public android.net.wifi.WifiInfo makeCopy(boolean);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final String FREQUENCY_UNITS = "MHz";
     field public static final String LINK_SPEED_UNITS = "Mbps";
@@ -662,7 +661,6 @@
     method @Nullable public java.net.Inet6Address getPeerIpv6Addr();
     method public int getPort();
     method public int getTransportProtocol();
-    method @NonNull public android.net.wifi.aware.WifiAwareNetworkInfo makeCopy(boolean);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareNetworkInfo> CREATOR;
   }