Merge "Remove ConnectivityManager swapActiveStatsMap API" am: 5635d505e0 am: cab6183ca4

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

Change-Id: I4813a1fd9f78970e989dea3044c3d06163fb338d