[automerger skipped] DO NOT MERGE: Add unit tests to ensure VPN meteredness am: f9af67fd0c -s ours
am: ae26c868ce
Change-Id: Iddfe4fcc6f7eca5ac94955205fb57296d6b029ad
This commit is contained in: