Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71
am: c37ba5cbc1
* commit 'c37ba5cbc18ccb81e9378aff4d44437702318fe3':
Change-Id: I7d5641f96f6e1983544f962f91e2e2ffad9f9e8f
This commit is contained in: