Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev

am: 3f7314e331

* commit '3f7314e3310fbaddc984ae3218f7bb22f13cda11':
  Revert "New systemapi to mark a wifi network as metered."

diff --cc api/system-current.txt
index 1f08c0c,176b9f2..0758a70
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -26663,11 -21119,8 +26663,10 @@@ package android.net.wifi 
      method public boolean reconnect();
      method public boolean removeNetwork(int);
      method public boolean saveConfiguration();
-     method public boolean setMetered(int, boolean);
      method public void setTdlsEnabled(java.net.InetAddress, boolean);
      method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
 +    method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
 +    method public boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
      method public boolean setWifiEnabled(boolean);
      method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource);
      method public boolean startScan();

diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge