Merge "Remove ConnectivityManager swapActiveStatsMap API" am: 5635d505e0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2002453

Change-Id: Ic92933aadcc12189c61575745d8cf91dd0f4ffa8