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

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

Change-Id: I06e8e68ec621c70698eb464f36a770c361ae4c13