[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am: 93dfa10da4 am: c2a6f8af78
am:56f915acaa-s ours am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA16cfd15e33eis in history Change-Id: I3ddc59f7abb5e3c0a2f4f54bb68632578948ee89
This commit is contained in: