Merge "Synchronize the NetworkStatsFactory constructor."
am: f2bd2bbfd8

Change-Id: Ie06b2d7c43603a202db28801678c42716c8a019f