Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6 am: 7962445ee4 am: 3dcb0bdb5a

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

Change-Id: I7d8ef9128dee274a0c6b66f4632c0034ff8075da