tree bdb45255a398bea39c3a9a21f592d80f5876044d
parent 29d2ef2fe10ce9686b57a21aa8e10f6481c92a9a
author Varun Anand <vaanand@google.com> 1548381780 -0800
committer Varun Anand <vaanand@google.com> 1553794311 -0700

Move BatteryStats and StatsCompanionService to use NetworkStatsService.

This CL is a manual merge of http://ag/c/6015966/3.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: manual test: verified that BatteryStats are correctly accounting
for VPN traffic.
Change-Id: I5b07ce70ac58bdcbebc3114bfe9fd411469d57af
Merged-In: I230c1edbf64cfeb3dbb560db368b5e420f7b79a4