Merge "Remove ConnectivityManager swapActiveStatsMap API"