[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev
am: ce5d395bb1  -s ours

Change-Id: I4182b2dfad1f40dd29da8c3612cf0dbc4038aa7b
tree: d1a43430c73d757337b181a1fa7a2c4a687ad47e
  1. core/
  2. services/
  3. tests/