Merge "Remove ConnectivityManager swapActiveStatsMap API" am: b2b27c5756 am: 1e3174ceff am: df4904fa3e

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

Change-Id: I678434977bcedf068ff6a51772393984d6a45a92