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

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

Change-Id: Ic9b08c77015a15f6f3e93c980014b19f63be583b