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

Change-Id: I83c93bb4fbd0302fe31c38a1dcbf6691d0043be3