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

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

Change-Id: I24f6e08ce84fc4259dfe862f9958e88a2fc9b4df