Merge "[DU03]Remove INetworkStatsService from BatteryStatsImpl" am: cc32b705b3 am: b19005e63b am: a3a5239252

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

Change-Id: I0dd29dd55ec9e71f53ab32d59440fde638bb592d