[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am: 182784fea4 -s ours
am: d9801eced8 -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 45406bff69 is in history

Change-Id: I34c36c55ba985118ffc2210b2e05daab2a0ea8e8
tree: db8246d28e8d6377b7aff62adca01020d4e1215f
  1. core/
  2. services/
  3. tests/