[automerger skipped] Merge "Have BatteryStatsImpl use the public NetworkStats API" am: 25d96f8d4d am: f566c778a7 am: 35802e3cf5 am: eb94286598 -s ours

am skip reason: Merged-In I0bfb4df45e373aa3907b07a382ba8edd07c73895 with SHA-1 c5594827a2 is already in history

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

Change-Id: I115b8c3ae638389c095030e1e3a096f6ed03d8cd