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

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

Change-Id: I1e486516b83f0496edcc650d117c155fc930c73e