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

Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d
tree: f12034ea2bc5a29e6a884dc226531c850068c848
  1. core/
  2. services/
  3. tests/