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

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

Change-Id: I3f0d37493a44cb4f3488b747a039a3c9e60c33ac