Merge "Remove ConnectivityManager swapActiveStatsMap API" am: b2b27c5756 am: f841d2786e am: bae25cbd84

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

Change-Id: I678434977bcedf068ff6a51772393984d6a45a92
tree: 652c95c8c8ad7018f282d9d49ad0bc264c62f3c1
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/