Merge "Remove all static members from NetworkStatsFactory."
am: 63f94f411b

Change-Id: I4657796f2c2083d11e8a0de75c6b61e0443a7015