Merge "[DU03-2]Remove INetworkStatsService from BatteryStatsImpl" am: 413a3b1306 am: aa8b1bbda4 am: aeaa964bd9

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

Change-Id: Ie7c2e478c655fcde7f09346856e9eee9297b5230