tree eff1a4b04b0744762e10c005257fd0d986526540
parent 2838d9bb56be242278719dd396829b4f391268b0
author Jeremy Joslin <jjoslin@google.com> 1470697657 -0700
committer Lorenzo Colitti <lorenzo@google.com> 1481258549 +0900

DO NOT MERGE: VPN network stat accounting changes.

Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871

(cherry picked from commit 12255e3655823ed56d51baf75031dd6d125b598e)

Change-Id: I06f01aa8fe5fdc06b2d36cfb9c68feb244c2e5de