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

Change-Id: Iadf012754e2e39f4b99efc97d5666dd0bc1ff2d6