[automerger skipped] Merge "[MS70] Have BatteryStatsImpl use the public NetworkStats API" am: 8bbb5be10e am: 6a48a6d6f2 am: acc12c32f4 am: 94c6cdf4fb -s ours

am skip reason: Merged-In I35dd909b5da563cea27d8a81a81fe472c59e9b17 with SHA-1 78fc678571 is already in history

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

Change-Id: Iacf4d3d607794ac891603c03693ef897a4d66bb3