Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" am: a078c73c47 am: 991351f546 am: 3edf76ed6a

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

Change-Id: Ibe90f9f1baf1950b9095747b2515e1cc9ffd7fd0