Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: c452cbf496 am: 1c3e46628c -s ours
am: 3427f091e0 -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 c1b3fc8712 is in history
Change-Id: Ica19aba40268a7e4facbc35cb108ab9fdc1c1ada
This commit is contained in: