Merge "Remove ConnectivityManager swapActiveStatsMap API" am: b2b27c5756

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

Change-Id: Ifb73591d43760e8b3f13146feb2116596c5d5844