Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: 121c4fc872 am: b78a7dba1c am: 08ea96702d

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

Change-Id: Ie52faaff3b8b63ef6f9938a0022a4ecbdca69a2f