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

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

Change-Id: Ie52faaff3b8b63ef6f9938a0022a4ecbdca69a2f