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

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

Change-Id: I6cdbb98488d4d465aa1559cf295850e07f8731c2