Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: bd94f0afd2 am: 92292f556b
am: cf545aa02a

Change-Id: Ibe2fcacb3779b3c6bc484fe6f398475bf5b6383b