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

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

Change-Id: I0e3dba9c3eef3f637274360a2b9119a97c1607f7