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

Change-Id: I7f787d14b7c7dee7a77dbed84266f8192c21c446