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

Change-Id: I615e20354c171f8ef2184106c2e29a73446d3f27