Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API"