Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev