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

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

Change-Id: Ife48b26f966b78d9a9016332bb968c3c863b8425