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