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

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

Change-Id: I1c941b69320c7f4ffdaa5f7ae1c2914a56c915f1