[automerger skipped] DO NOT MERGE: Add unit tests to ensure VPN meteredness am: f0713b5491  -s ours
am: e240835101

Change-Id: Iddfe4fcc6f7eca5ac94955205fb57296d6b029ad
tree: ed4b61f0b3ff9c78380a9c221f5b7f66876ee896
  1. core/
  2. services/
  3. tests/