[automerger skipped] Merge "[DU03]Remove INetworkStatsService from...

[automerger skipped] Merge "[DU03]Remove INetworkStatsService from BatteryStatsImpl" am: 296fbccd am: 33695e7a am: 95d57bdc am: c5e2547e -s ours

am skip reason: Merged-In I584897ff8ba303c717a9df3756c9f6778c1cfb10 with SHA-1 f504f091 is already in history

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

Change-Id: I8fb6143d9cf573c5489328e0d7ffb8f774767c0b