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."