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

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

Change-Id: I301aee43211c58fb0a3461846df6da238bf69e63