Merge "[DU03-1]Remove INetworkStatsService from BatteryStatsImpl" am: acd0aef603 am: 9c737b782c

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

Change-Id: If2164db2bf7b8cc239a90341c68c623ac3a8518c