Merge "Use NetworkStatsService to get stats for apps" am: 8469cd614d
am: fa7f4015fc

Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f
tree: c9aef393bf235faec47aedf612f4734e130a5673
  1. core/
  2. services/
  3. wifi/