Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e am: 43581b87" into oc-mr1-dev-plus-aosp