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

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

Change-Id: Iec474f98457ca27366ff19cd7c840e421d343921