Merge "Use NetworkStatsService to get stats for apps" am: 693d8a2ab1
am: fa7f4015fc

Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f