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