Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f