[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am: 93dfa10da4 am: a8cb41a94d
am: fcdb1380ac -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 02c50ef1d1 is in history

Change-Id: I3ddc59f7abb5e3c0a2f4f54bb68632578948ee89