tree 381c4443d0a5d3b956b5c8e6e44858f452be38de
parent f6cb43ae329deb67f14d55d6472643d4f18bce32
parent ffe5a46b3e65389722333482a959f98767c4c74c
author Jeremy Joslin <jjoslin@google.com> 1481275417 +0000
committer android-build-merger <android-build-merger@google.com> 1481275417 +0000

DO NOT MERGE: VPN network stat accounting changes.
am: ffe5a46b3e  -s ours

Change-Id: Ic42723be04158feafd268b3859f0e938d3e36d01