Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: 1b84b424f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948924

Change-Id: I2b5a372651087b9a22df53800e9320c1c95e02cc