Merge "Add an API that allows VPNs to declare themselves as metered."