[automerger skipped] DO NOT MERGE: Add unit tests to ensure VPN meteredness am: 66bc52884b  -s ours am: 79aad4f39a
am: c855305414  -s ours

Change-Id: If31120156a3a4cd302f224b4e00640e2ae63e211