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

Change-Id: Iebaa91b450f1c43a978e96a15e409423e3ef6bb7