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

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

Change-Id: I042d2e008c113735c0b9e7a13da3b33927ea3e64