DO NOT MERGE: VPN network stat accounting changes. am: 8c7be6114c -s ours am: 12bb3f057b -s ours
am: 652c3e59e9
Change-Id: Ie33371e7e4e47071aa9f74fef93ddf2cff2ec57a
This commit is contained in: