Merge "Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev am: eb98edfb83" into oc-mr1-dev-plus-aosp
am: c623db3d98

Change-Id: I5512c904eb29e2819358299df36f7a1c2c261992