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

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

Change-Id: Ia67444c042f7cc60585a279fef973df12b223478
tree: c9a9502cbdfce751d7088829b443099a184107ec
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/