Merge "[MS70] Have BatteryStatsImpl use the public NetworkStats API" am: 8bbb5be10e am: 6a48a6d6f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978092

Change-Id: I81ad272bcfd09eaf9da4dbcaf2e5b56c73eba5ea