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

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

Change-Id: Ideb09004826ade4184eb5bd3095ad72e862c725e