Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl" am: 413a3b1306 am: 0243072c74

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1953494

Change-Id: I79a90eb6a736190e70a451154cc7975b0d958d85