Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am: 93dfa10da4
am: 9e3e89cde6

Change-Id: Ieb10b88344dd4436913426961e6999577a469f36