[automerger skipped] Merge "Remove ConnectivityManager and its usages from...
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
am: a24113f0 -s ours
am skip reason: SHA1 a24113f0 skipped by user vaanand
Change-Id: Ieee5f28f6d10b0d2b8a7b3eb0272297f148ef03f