Revert "DO NOT MERGE: Add API to indicate carrier networks."

These changes are not applicable for aosp and will be implemented in
master.

This reverts commit 9f47a5d85e.

Bug: 31003437

wifi/java/android/net/wifi/IWifiManager.aidl

@@ -53,8 +53,6 @@ interface IWifiManager
 
     List<WifiConfiguration> getConfiguredNetworks();
 
-    boolean hasCarrierConfiguredNetworks();
-
     List<WifiConfiguration> getPrivilegedConfiguredNetworks();
 
     WifiConfiguration getMatchingWifiConfig(in ScanResult scanResult);

wifi/java/android/net/wifi/WifiManager.java

@@ -747,15 +747,6 @@ public class WifiManager {
         }
     }
 
-    /** @hide */
-    public boolean hasCarrierConfiguredNetworks() {
-        try {
-            return mService.hasCarrierConfiguredNetworks();
-        } catch (RemoteException e) {
-            throw e.rethrowFromSystemServer();
-        }
-    }
-
     /** @hide */
     @SystemApi
     public List<WifiConfiguration> getPrivilegedConfiguredNetworks() {