[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am: a24113f030 -s ours
am: c14d2102db -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 02c50ef1d1 is in history

Change-Id: I34c36c55ba985118ffc2210b2e05daab2a0ea8e8