Merge "Add an API that allows VPNs to declare themselves as metered."
am: 35200a3b8a

Change-Id: Iadf012754e2e39f4b99efc97d5666dd0bc1ff2d6
tree: 4126216ab5be723837e9635628499788f9b3259f
  1. core/
  2. services/
  3. tests/