Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6 am: 99e5e8102d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949804

Change-Id: I92bc8ca4b6b12904dddef56467978bd7d16d2a22