Merge "Have BatteryStatsImpl use the public NetworkStats API" am: 25d96f8d4d am: f566c778a7

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

Change-Id: Ic25cef9d6ce7904bf818dcfd38aa924fac21fd6f