Merge "Move NetworkStatsFactory into service directory"
am: c832132056

Change-Id: If92f556cbf3badcb057a3b6e43bb3ef74d0c9ac0
tree: de13efb2d18f95f4b69c35064669666a675e3c76
  1. core/
  2. services/
  3. tests/